jackdanielz pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=de068b84679251cbf8572cb471202a534ce141c4
commit de068b84679251cbf8572cb471202a534ce141c4 Author: Daniel Zaoui <daniel.za...@samsung.com> Date: Tue Nov 10 08:35:48 2015 +0200 Factory: update widgets configuration The size hint weight was not set, leading to weird resizing when resized inside a window. --- data/layouts/factory.json | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/data/layouts/factory.json b/data/layouts/factory.json index 1667c2d..e5731c5 100644 --- a/data/layouts/factory.json +++ b/data/layouts/factory.json @@ -14,6 +14,7 @@ "Elm.Win.autodel":[true], "Efl.Gfx.Base.size":[300, 300], "Elm.Widget.part_text":[null, "Window"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] }, "Contains": ["Bg"] @@ -47,6 +48,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Button"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[73, 30] } @@ -60,6 +62,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Label"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[60, 30] } @@ -73,6 +76,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Check"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[80, 30] } @@ -86,8 +90,9 @@ "Properties": { "Elm.Widget.part_text":[null, "Radio"], - "Efl.Gfx.Base.visible":[true], "Elm.Radio.state_value":[0], + "Evas.Object.size_hint_weight":[1, 1], + "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[80, 30] } }, @@ -99,6 +104,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.File.file":["erigo_icon", null], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[40, 40] @@ -112,6 +118,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.File.file":["factory_image", null], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[40, 40] @@ -125,10 +132,11 @@ }, "Properties": { + "Elm.Actionslider.indicator_pos":["ELM_ACTIONSLIDER_CENTER"], "Elm.Widget.part_text":["left", "Action"], "Elm.Widget.part_text":["center", null], "Elm.Widget.part_text":["right", "slider"], - "Elm.Actionslider.indicator_pos":["ELM_ACTIONSLIDER_CENTER"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[180, 30] } @@ -142,6 +150,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Bubble"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[70, 50] } @@ -154,6 +163,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[120, 120] } @@ -168,6 +178,7 @@ { "Elm.Colorselector.mode":["ELM_COLORSELECTOR_COMPONENTS"], "Elm.Colorselector.color":[255, 0, 0, 255], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 165] } @@ -180,6 +191,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[290, 20] } @@ -192,6 +204,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[65, 35] } @@ -205,8 +218,9 @@ "Properties": { "Elm.Entry.scrollable":[true], - "Efl.Gfx.Base.visible":[true], "Elm.Widget.part_text":[null, "Entry"], + "Evas.Object.size_hint_weight":[1, 1], + "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[65, 35] } }, @@ -218,6 +232,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Evas.Object.size_hint_min":[75, 75], "Elm.Image.resizable":[true, true], "Efl.Gfx.Base.visible":[true] @@ -231,6 +246,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 30] } @@ -244,6 +260,7 @@ "Properties": { "Elm_Interface_Fileselector.path":["/home"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 200] } @@ -258,6 +275,7 @@ { "Elm.Widget.part_text":[null, "Select a file"], "Elm_Interface_Fileselector.path":["/home"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 30] } @@ -271,6 +289,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Select a file"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 30] } @@ -283,6 +302,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[4, 40] } @@ -296,6 +316,7 @@ "Properties": { "Elm.Progressbar.value":[0.35], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[165, 30] } @@ -309,6 +330,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Hoversel"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[60, 40] } @@ -322,6 +344,7 @@ "Properties": { "Elm.Widget.part_text":[null, "Frame"], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true], "Efl.Gfx.Base.size":[60, 60] } @@ -335,6 +358,7 @@ "Properties": { "Elm.Box.padding":[7, 0], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.size":[200, 200], "Efl.Gfx.Base.visible":[true] }, @@ -367,6 +391,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] } }, @@ -378,6 +403,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] } }, @@ -432,6 +458,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] } }, @@ -443,6 +470,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] } }, @@ -454,6 +482,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] } }, @@ -465,6 +494,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.size":[80, 30], "Efl.Gfx.Base.visible":[true] } @@ -505,6 +535,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.size":[80, 40], "Efl.Gfx.Base.visible":[true] } @@ -517,6 +548,7 @@ }, "Properties": { + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.size":[80, 40], "Efl.Gfx.Base.visible":[true] } @@ -531,6 +563,7 @@ { "Elm.Box.horizontal":[true], "Elm.Box.padding":[7, 0], + "Evas.Object.size_hint_weight":[1, 1], "Efl.Gfx.Base.visible":[true] } }, @@ -542,8 +575,9 @@ }, "Properties": { - "Evas.Object.size_hint_min":[55, 55], "Elm.Image.resizable":[true, true], + "Evas.Object.size_hint_weight":[1, 1], + "Evas.Object.size_hint_min":[55, 55], "Efl.Gfx.Base.visible":[true] } }, --