|
commit 4041608e9487bb59e14593c52aca91054ff79cdf
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sun Jan 16 19:32:43 2022 +0100
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sun Jan 16 19:47:16 2022 +0100
Update fluid files and generated files
fluid/widget_panel.cxx: apply previous fluid fix
fluid/about_panel.fl | 4 ++--
fluid/alignment_panel.fl | 14 +++++++-------
fluid/function_panel.fl | 22 +++++++++++-----------
fluid/print_panel.fl | 4 ++--
fluid/template_panel.fl | 2 +-
fluid/widget_panel.cxx | 2 +-
fluid/widget_panel.fl | 4 ++--
test/preferences.fl | 2 +-
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git fluid/about_panel.fl fluid/about_panel.fl
index 4b519df..2d465a8 100644
--- fluid/about_panel.fl
+++ fluid/about_panel.fl
@@ -36,8 +36,8 @@ if (!cbuf[0]) {
}} {}
Fl_Window about_panel {
label {About FLUID} open
- xywh {449 217 345 180} type Double color 50 selection_color 47 hotspot
- code0 {\#include "../src/flstring.h"} non_modal visible
+ xywh {449 217 345 180} type Double color 50 selection_color 47 hide hotspot
+ code0 {\#include "../src/flstring.h"} non_modal
} {
Fl_Box {} {
image {icons/fluid-96.xpm} xywh {10 10 115 120}
diff --git fluid/alignment_panel.fl fluid/alignment_panel.fl
index 8a4595e..716ebcc 100644
--- fluid/alignment_panel.fl
+++ fluid/alignment_panel.fl
@@ -54,9 +54,9 @@ Function {make_project_window()} {open
} {
Fl_Window project_window {
label {Project Settings} open
- xywh {472 246 399 298} type Double
+ xywh {472 246 399 298} type Double hide
code0 {\#include <FL/Fl_Preferences.H>}
- code1 {\#include <FL/Fl_Tooltip.H>} modal visible
+ code1 {\#include <FL/Fl_Tooltip.H>} modal
} {
Fl_Button {} {
label Close
@@ -175,8 +175,8 @@ Function {make_settings_window()} {open
} {
Fl_Window settings_window {
label {GUI Settings}
- xywh {442 538 360 355} type Double resizable
- code0 {o->size_range(o->w(), o->h());} non_modal visible
+ xywh {442 538 360 355} type Double hide resizable
+ code0 {o->size_range(o->w(), o->h());} non_modal
} {
Fl_Choice scheme_choice {
label {Scheme: }
@@ -309,7 +309,7 @@ Function {make_shell_window()} {open
} {
Fl_Window shell_window {
label {Shell Command} open
- xywh {544 751 365 200} type Double modal size_range {365 200 365 200} visible
+ xywh {544 751 365 200} type Double hide modal size_range {365 200 365 200}
} {
Fl_Group {} {open
xywh {0 0 365 165}
@@ -381,7 +381,7 @@ shell_window->hide();}
}
Fl_Window shell_run_window {
label {Shell Command Output}
- xywh {887 409 555 430} type Double resizable visible
+ xywh {887 409 555 430} type Double hide resizable
} {
Fl_Simple_Terminal shell_run_terminal {
xywh {10 10 535 375} resizable
@@ -403,7 +403,7 @@ Function {make_layout_window()} {open
} {
Fl_Window grid_window {
label {Layout Settings}
- xywh {745 303 310 245} type Double non_modal visible
+ xywh {745 303 310 245} type Double hide non_modal
} {
Fl_Input horizontal_input {
label x
diff --git fluid/function_panel.fl fluid/function_panel.fl
index 953bb05..f66f603 100644
--- fluid/function_panel.fl
+++ fluid/function_panel.fl
@@ -51,7 +51,7 @@ Function {make_function_panel()} {open
} {
Fl_Window function_panel {
label {Function/Method Properties} open
- xywh {101 713 343 232} type Double resizable modal visible
+ xywh {101 713 343 232} type Double hide resizable modal
} {
Fl_Group {} {open
xywh {10 10 270 20}
@@ -136,8 +136,8 @@ Function {make_code_panel()} {open
callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape)
return; // ignore Escape
code_panel->hide(); // otherwise hide..}
- xywh {425 882 540 180} type Double labelsize 11 resizable
- code0 {o->size_range(200, 150);} modal visible
+ xywh {425 882 540 180} type Double labelsize 11 hide resizable
+ code0 {o->size_range(200, 150);} modal
} {
Fl_Text_Editor code_input {
xywh {10 10 520 130} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable
@@ -170,8 +170,8 @@ Function {make_codeblock_panel()} {open
} {
Fl_Window codeblock_panel {
label {Code Block Properties}
- xywh {806 735 300 115} type Double labelsize 11 resizable
- code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal visible
+ xywh {806 735 300 115} type Double labelsize 11 hide resizable
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} {
Fl_Input code_before_input {
label {Conditional code block}
@@ -203,8 +203,8 @@ Function {make_declblock_panel()} {open
} {
Fl_Window declblock_panel {
label {Declaration Block Properties}
- xywh {806 564 300 135} type Double labelsize 11 resizable
- code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal visible
+ xywh {806 564 300 135} type Double labelsize 11 hide resizable
+ code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} {
Fl_Group {} {open
xywh {10 10 280 20}
@@ -260,7 +260,7 @@ Function {make_decl_panel()} {open
} {
Fl_Window decl_panel {
label {Declaration Properties}
- xywh {445 609 343 237} type Double align 80 resizable size_range {343 237 0 0} visible
+ xywh {445 609 343 237} type Double align 80 hide resizable size_range {343 237 0 0}
} {
Fl_Group {} {open
xywh {10 10 270 20}
@@ -337,7 +337,7 @@ Function {make_data_panel()} {open
} {
Fl_Window data_panel {
label {Inline Data Properties}
- xywh {449 337 343 237} type Double align 80 resizable size_range {343 237 0 0} visible
+ xywh {449 337 343 237} type Double align 80 hide resizable size_range {343 237 0 0}
} {
Fl_Group {} {open
xywh {10 10 320 20}
@@ -426,7 +426,7 @@ Function {make_class_panel()} {open
} {
Fl_Window class_panel {
label {Class Properties}
- xywh {795 337 342 196} type Double labelsize 11 resizable modal size_range {343 188 0 0} visible
+ xywh {795 337 342 196} type Double labelsize 11 hide resizable modal size_range {343 188 0 0}
} {
Fl_Group {} {open
xywh {10 10 280 20} hide
@@ -541,7 +541,7 @@ Function {make_widgetbin()} {open
exit_cb((Fl_Widget*)o, v);
else
toggle_widgetbin_cb((Fl_Widget*)o, v);} open
- xywh {449 206 600 102} type Single align 80 non_modal visible
+ xywh {449 206 600 102} type Single align 80 hide non_modal
} {
Fl_Group {} {
label Code open
diff --git fluid/print_panel.fl fluid/print_panel.fl
index e85f349..8b402d0 100644
--- fluid/print_panel.fl
+++ fluid/print_panel.fl
@@ -39,7 +39,7 @@ Function {make_print_panel()} {open
} {
Fl_Window print_panel {
label Print
- xywh {465 222 465 235} type Double modal visible
+ xywh {465 222 465 235} type Double hide modal
} {
Fl_Group print_panel_controls {open
xywh {10 10 447 216}
@@ -213,7 +213,7 @@ print_collate_group[1 - i]->hide();}
label {Printer Properties}
callback {print_properties_panel->hide();
print_update_status();}
- xywh {462 486 290 130} type Double modal visible
+ xywh {462 486 290 130} type Double hide modal
} {
Fl_Choice print_page_size {
label {Page Size:}
diff --git fluid/template_panel.fl fluid/template_panel.fl
index 7b5f9b1..879b94b 100644
--- fluid/template_panel.fl
+++ fluid/template_panel.fl
@@ -69,7 +69,7 @@ template_browser->deselect();
template_name->value("");
template_instance->value("");
template_panel->hide();}
- xywh {455 202 460 355} type Double resizable modal visible
+ xywh {455 202 460 355} type Double hide resizable modal
} {
Fl_Browser template_browser {
label {Available Templates:}
diff --git fluid/widget_panel.cxx fluid/widget_panel.cxx
index adad711..f232e0d 100644
--- fluid/widget_panel.cxx
+++ fluid/widget_panel.cxx
@@ -93,7 +93,7 @@ Fl_Double_Window* make_widget_panel() {
Fl_Double_Window* w;
{ // Use a Double Window to avoid flickering.
Fl_Double_Window* o = new Fl_Double_Window(420, 400);
- w = o; if (w) {/* empty */}
+ w = o; (void)w;
o->labelsize(11);
o->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE));
o->hotspot(o);
diff --git fluid/widget_panel.fl fluid/widget_panel.fl
index 1e986b2..9cf71c5 100644
--- fluid/widget_panel.fl
+++ fluid/widget_panel.fl
@@ -28,8 +28,8 @@ Function {make_widget_panel()} {
} {
Fl_Window {} {
comment {Use a Double Window to avoid flickering.} open
- xywh {500 209 420 400} type Double labelsize 11 align 80 resizable hotspot
- code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} visible
+ xywh {500 209 420 400} type Double labelsize 11 align 80 hide resizable hotspot
+ code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0}
} {
Fl_Tabs {} {
callback {propagate_load((Fl_Group *)o,v);} open
diff --git test/preferences.fl test/preferences.fl
index d90119f..e7d5b17 100644
--- test/preferences.fl
+++ test/preferences.fl
@@ -50,7 +50,7 @@ Function {} {open return_type int
Fl_Window myWindow {
label {My Preferences}
callback closeWindowCB open
- xywh {585 277 298 311} type Double visible
+ xywh {585 277 298 311} type Double hide
} {
Fl_Button {} {
label Cancel
[ Direct Link to Message ] | |