fly/fgdata
1
0
Fork 0
Code Activity

canvas.gui: let widgets set layout size to allow user defined size hints.

Browse source
This commit is contained in:
Thomas Geymayer 2014-07-12 17:55:45 +02:00
parent 2452ab0f5c
commit bb1ab2d975
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Nasal/canvas/gui/Widget.nas
View file

@ -13,9 +13,9 @@ gui.Widget = {
_size: [32, 32] _size: [32, 32]
}); });
m.setMinimumSize([16, 16]); m.setLayoutMinimumSize([16, 16]);
m.setSizeHint([32, 32]); m.setLayoutSizeHint([32, 32]);
m.setMaximumSize([m._MAX_SIZE, m._MAX_SIZE]); m.setLayoutMaximumSize([m._MAX_SIZE, m._MAX_SIZE]);
m.setSetGeometryFunc(m._impl.setGeometry); m.setSetGeometryFunc(m._impl.setGeometry);

12
Nasal/canvas/gui/styles/DefaultStyle.nas
View file

@ -52,8 +52,8 @@ DefaultStyle.widgets.button = {
me._label.set("text", text); me._label.set("text", text);
var min_width = math.max(80, me._label.maxWidth() + 16); var min_width = math.max(80, me._label.maxWidth() + 16);
model.setMinimumSize([min_width, 16]); model.setLayoutMinimumSize([min_width, 16]);
model.setSizeHint([min_width, 28]); model.setLayoutSizeHint([min_width, 28]);
return me; return me;
}, },
@ -133,8 +133,8 @@ DefaultStyle.widgets.checkbox = {
me._label.set("text", text); me._label.set("text", text);
var min_width = me._label.maxWidth() + 24; var min_width = me._label.maxWidth() + 24;
model.setMinimumSize([min_width, 18]); model.setLayoutMinimumSize([min_width, 18]);
model.setSizeHint([min_width, 24]); model.setLayoutSizeHint([min_width, 24]);
return me; return me;
}, },
@ -221,8 +221,8 @@ DefaultStyle.widgets.label = {
} }
model.setHeightForWidthFunc(hfw_func); model.setHeightForWidthFunc(hfw_func);
model.setMinimumSize([min_width, 14]); model.setLayoutMinimumSize([min_width, 14]);
model.setSizeHint([width_hint, 24]); model.setLayoutSizeHint([width_hint, 24]);
return me.update(model); return me.update(model);
}, },