diff --git a/Nasal/canvas/gui/Widget.nas b/Nasal/canvas/gui/Widget.nas index ab65bc27b..652da5c4b 100644 --- a/Nasal/canvas/gui/Widget.nas +++ b/Nasal/canvas/gui/Widget.nas @@ -13,9 +13,9 @@ gui.Widget = { _size: [32, 32] }); - m.setMinimumSize([16, 16]); - m.setSizeHint([32, 32]); - m.setMaximumSize([m._MAX_SIZE, m._MAX_SIZE]); + m.setLayoutMinimumSize([16, 16]); + m.setLayoutSizeHint([32, 32]); + m.setLayoutMaximumSize([m._MAX_SIZE, m._MAX_SIZE]); m.setSetGeometryFunc(m._impl.setGeometry); diff --git a/Nasal/canvas/gui/dialogs/AircraftCenter.nas b/Nasal/canvas/gui/dialogs/AircraftCenter.nas index c63bf803e..82efc7aa1 100644 --- a/Nasal/canvas/gui/dialogs/AircraftCenter.nas +++ b/Nasal/canvas/gui/dialogs/AircraftCenter.nas @@ -179,7 +179,7 @@ var AircraftCenter = { var acft_id = variant; 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})); }); launch_bar.addItem(b); diff --git a/Nasal/canvas/gui/styles/DefaultStyle.nas b/Nasal/canvas/gui/styles/DefaultStyle.nas index b1b3583a9..cc8008e4a 100644 --- a/Nasal/canvas/gui/styles/DefaultStyle.nas +++ b/Nasal/canvas/gui/styles/DefaultStyle.nas @@ -52,8 +52,8 @@ DefaultStyle.widgets.button = { me._label.set("text", text); var min_width = math.max(80, me._label.maxWidth() + 16); - model.setMinimumSize([min_width, 16]); - model.setSizeHint([min_width, 28]); + model.setLayoutMinimumSize([min_width, 16]); + model.setLayoutSizeHint([min_width, 28]); return me; }, @@ -133,8 +133,8 @@ DefaultStyle.widgets.checkbox = { me._label.set("text", text); var min_width = me._label.maxWidth() + 24; - model.setMinimumSize([min_width, 18]); - model.setSizeHint([min_width, 24]); + model.setLayoutMinimumSize([min_width, 18]); + model.setLayoutSizeHint([min_width, 24]); return me; }, @@ -221,8 +221,8 @@ DefaultStyle.widgets.label = { } model.setHeightForWidthFunc(hfw_func); - model.setMinimumSize([min_width, 14]); - model.setSizeHint([width_hint, 24]); + model.setLayoutMinimumSize([min_width, 14]); + model.setLayoutSizeHint([width_hint, 24]); return me.update(model); }, diff --git a/Nasal/canvas/map/runway-nd.draw b/Nasal/canvas/map/runway-nd.draw index 560ad1a76..3260b9753 100644 --- a/Nasal/canvas/map/runway-nd.draw +++ b/Nasal/canvas/map/runway-nd.draw @@ -57,6 +57,5 @@ var _draw_rwy_nd = func (group, lat, lon, length, width, rwyhdg, id) { .setFont("LiberationFonts/LiberationSans-Regular.ttf") .setFontSize(28) .setTranslation(35,0) - .setColor(1,1,1) - .setBackdropColor(0,0,0); + .setColor(1,1,1); } diff --git a/version b/version index fd2a01863..15a279981 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.1.0 +3.3.0