fly/fgdata
1
0
Fork 0
Code Activity

canvas.gui: support height-for-width layouting.

Browse source 
Setting wordWrap on canvas.gui.Label enables height-for-width
where the height of the label depends on the layouted texts
width.
This commit is contained in:
Thomas Geymayer 2014-06-13 00:15:30 +02:00
parent 2aeeae855f
commit 3505d3c8bf
5 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Nasal/canvas/gui/Config.nas
View file

@ -17,5 +17,10 @@ var Config = {
return val;
return default;
},
set: func(key, value)
{
me._cfg[key] = value;
return me;
}
};

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

@ -61,7 +61,7 @@ gui.Widget = {
me._size[1] = h;
if( me._view != nil )
me._view.setSize(w, h);
me._view.setSize(me, w, h);
return me;
},
# Set geometry of widget (usually used by layouting system)

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

@ -39,7 +39,7 @@ DefaultStyle.widgets.button = {
.set("character-size", 14)
.set("alignment", "center-baseline");
},
setSize: func(w, h)
setSize: func(model, w, h)
{
me._bg.reset()
.rect(3, 3, w - 6, h - 6, {"border-radius": 5});
@ -108,7 +108,7 @@ DefaultStyle.widgets.label = {
{
me._root = parent.createChild("group", "label");
},
setSize: func(w, h)
setSize: func(model, w, h)
{
if( me['_bg'] != nil )
me._bg.reset().rect(0, 0, w, h);
@ -116,22 +116,39 @@ DefaultStyle.widgets.label = {
me._img.set("size[0]", w)
.set("size[1]", h);
if( me['_text'] != nil )
{
# TODO different alignment
me._text.setTranslation(2, h / 2);
me._text.setTranslation(2, 2 + h / 2);
me._text.set(
"max-width",
model._cfg.get("wordWrap", 0) ? (w - 4) : 0
);
}
return me;
},
setText: func(model, text)
{
if( text == nil or size(text) == 0 )
{
model.setHeightForWidthFunc(nil);
return me._deleteElement('text');
}
me._createElement("text", "text")
.set("text", text)
.set("fill", "black");
# TODO get real font metrics
model.setMinimumSize([size(text) * 5 + 4, 14]);
model.setSizeHint([size(text) * 5 + 14, 24]);
if( model._cfg.get("wordWrap", 0) )
{
var m = me;
model.setHeightForWidthFunc(func(w) m.heightForWidth(w));
}
else
{
# TODO get real font metrics
model.setMinimumSize([size(text) * 5 + 4, 14]);
model.setSizeHint([size(text) * 5 + 14, 24]);
}
return me;
},
@ -155,9 +172,16 @@ DefaultStyle.widgets.label = {
me._createElement("bg", "path")
.set("fill", bg);
me.setSize(model._size[0], model._size[1]);
me.setSize(model, model._size[0], model._size[1]);
return me;
},
heightForWidth: func(w)
{
if( me['_text'] == nil )
return -1;
return math.max(14, me._text.heightForWidth(w - 4));
},
# protected:
_createElement: func(name, type)
{

4
Nasal/canvas/gui/widgets/Label.nas
View file

@ -1,10 +1,10 @@
gui.widgets.Label = {
new: func(parent, style, cfg)
{
var cfg = Config.new(cfg);
var m = gui.Widget.new(gui.widgets.Label);
m._cfg = Config.new(cfg);
m._focus_policy = m.NoFocus;
m._setView( style.createWidget(parent, "label", cfg) );
m._setView( style.createWidget(parent, "label", m._cfg) );
return m;
},

8
Nasal/canvas/gui/widgets/ScrollArea.nas
View file

@ -179,8 +179,12 @@ gui.widgets.ScrollArea = {
var min_size = me._layout.minimumSize();
var max_size = me._layout.maximumSize();
var size_hint = me._layout.sizeHint();
var w = math.min(max_size[0], math.max(math.max(min_size[0], size_hint[0]), me._size[0]));
var h = math.min(max_size[1], math.max(math.max(min_size[1], size_hint[1]), me._size[1]));
var w = math.min(max_size[0], math.max(size_hint[0], me._size[0]));
var h = math.max(
math.min(max_size[1], math.max(size_hint[1], me._size[1])),
me._layout.heightForWidth(w)
);
me._layout.setGeometry([0, 0, w, h]);
# Layout always has the origin at (0, 0)