fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
Hal V. Engel 2014-07-19 10:04:39 -07:00
commit 2314bc9259
5 changed files with 12 additions and 13 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);

2
Nasal/canvas/gui/dialogs/AircraftCenter.nas
View file

@ -179,7 +179,7 @@ var AircraftCenter = {
var acft_id = variant; var acft_id = variant;
b.listen("clicked", func b.listen("clicked", func
{ {
print("launch " ~ acft_id ~ '(' ~ package.variants[variant] ~ ')'); printlog("warn", "Switching to aircraft '" ~ acft_id ~ "'");
fgcommand("switch-aircraft", props.Node.new({"aircraft": acft_id})); fgcommand("switch-aircraft", props.Node.new({"aircraft": acft_id}));
}); });
launch_bar.addItem(b); launch_bar.addItem(b);

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);
}, },

3
Nasal/canvas/map/runway-nd.draw
View file

@ -57,6 +57,5 @@ var _draw_rwy_nd = func (group, lat, lon, length, width, rwyhdg, id) {
.setFont("LiberationFonts/LiberationSans-Regular.ttf") .setFont("LiberationFonts/LiberationSans-Regular.ttf")
.setFontSize(28) .setFontSize(28)
.setTranslation(35,0) .setTranslation(35,0)
.setColor(1,1,1) .setColor(1,1,1);
.setBackdropColor(0,0,0);
} }

2
version
View file

@ -1 +1 @@
3.1.0 3.3.0