diff options
| -rw-r--r-- | fluid/alignment_panel.cxx | 3 | ||||
| -rw-r--r-- | fluid/alignment_panel.fl | 7 | ||||
| -rw-r--r-- | fluid/widget_panel.fl | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index 81cd96b29..b3df61cfe 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -1015,7 +1015,7 @@ static void cb_Close(Fl_Button*, void*) { } Fl_Double_Window* make_settings_window() { - { Fl_Double_Window* o = settings_window = new Fl_Double_Window(340, 580, "FLUID Settings"); + { settings_window = new Fl_Double_Window(340, 580, "FLUID Settings"); settings_window->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE)); { w_settings_tabs = new Fl_Tabs(10, 10, 320, 530); w_settings_tabs->selection_color((Fl_Color)12); @@ -1674,7 +1674,6 @@ le FLTK_GETTEXT_FOUND"); o->callback((Fl_Callback*)cb_Close); } // Fl_Button* o settings_window->set_non_modal(); - o->size_range(o->w(), o->h()); settings_window->end(); } // Fl_Double_Window* settings_window w_settings_tabs->do_callback(w_settings_tabs, LOAD); diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index 1ff9d2c99..d6b9325b4 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -107,16 +107,15 @@ decl {void scheme_cb(Fl_Scheme_Choice *, void *);} {public local Function {make_settings_window()} {open } { Fl_Window settings_window { - label {FLUID Settings} open - xywh {423 204 340 580} type Double align 80 - code0 {o->size_range(o->w(), o->h());} non_modal visible + label {FLUID Settings} open selected + xywh {423 204 340 580} type Double align 80 non_modal visible } { Fl_Tabs w_settings_tabs { callback {propagate_load(o, v);} open xywh {10 10 320 530} selection_color 12 labelsize 11 labelcolor 255 } { Fl_Group {} { - label General open selected + label General open image {icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 code0 {o->image()->scale(36, 24);} } { diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index c72e2a18f..1ebbaa7d6 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -45,7 +45,7 @@ Function {make_widget_panel()} { } { Fl_Group {} { label GUI - callback propagate_load open + callback propagate_load open selected xywh {10 30 400 330} labelsize 11 when 0 resizable } { Fl_Group {} { @@ -477,7 +477,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11 } { Fl_Button {} { callback shortcut_in_cb - comment {This is a special button that grabs keystrokes directly} selected + comment {This is a special button that grabs keystrokes directly} tooltip {The shortcut key for the widget. Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selection_color 12 labelsize 11 when 1 code0 {\#include <FL/Fl_Shortcut_Button.H>} |