From d35b4eded3f48c42095f68b5169d2bb301ba1a06 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 30 May 2005 06:40:25 +0000 Subject: [PATCH] Made most Fluid properties dialogs duoble buffered, because they tend to flicker during resizing. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4381 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/function_panel.cxx | 56 ++++++++++++++++++++-------------------- fluid/function_panel.fl | 18 ++++++------- fluid/function_panel.h | 31 +++++++++++----------- 3 files changed, 53 insertions(+), 52 deletions(-) diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx index c60309ea0..1527adbec 100644 --- a/fluid/function_panel.cxx +++ b/fluid/function_panel.cxx @@ -35,7 +35,7 @@ extern class Fl_Pixmap *pixmap[]; extern class Fl_Type *Fl_Type_make(const char*); extern void select_only(Fl_Type*); -Fl_Window *function_panel=(Fl_Window *)0; +Fl_Double_Window *function_panel=(Fl_Double_Window *)0; Fl_Light_Button *f_public_button=(Fl_Light_Button *)0; @@ -49,9 +49,9 @@ Fl_Return_Button *f_panel_ok=(Fl_Return_Button *)0; Fl_Button *f_panel_cancel=(Fl_Button *)0; -Fl_Window* make_function_panel() { - Fl_Window* w; - { Fl_Window* o = function_panel = new Fl_Window(290, 150, "Function/Method Properties"); +Fl_Double_Window* make_function_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = function_panel = new Fl_Double_Window(290, 150, "Function/Method Properties"); w = o; { Fl_Group* o = new Fl_Group(10, 10, 270, 20); { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); @@ -110,7 +110,7 @@ Fl_Window* make_function_panel() { return w; } -Fl_Window *code_panel=(Fl_Window *)0; +Fl_Double_Window *code_panel=(Fl_Double_Window *)0; CodeEditor *code_input=(CodeEditor *)0; @@ -118,9 +118,9 @@ Fl_Return_Button *code_panel_ok=(Fl_Return_Button *)0; Fl_Button *code_panel_cancel=(Fl_Button *)0; -Fl_Window* make_code_panel() { - Fl_Window* w; - { Fl_Window* o = code_panel = new Fl_Window(540, 180, "Code Properties"); +Fl_Double_Window* make_code_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = code_panel = new Fl_Double_Window(540, 180, "Code Properties"); w = o; o->labelsize(11); { CodeEditor* o = code_input = new CodeEditor(10, 10, 520, 130); @@ -161,7 +161,7 @@ Fl_Window* make_code_panel() { return w; } -Fl_Window *codeblock_panel=(Fl_Window *)0; +Fl_Double_Window *codeblock_panel=(Fl_Double_Window *)0; Fl_Input *code_before_input=(Fl_Input *)0; @@ -171,9 +171,9 @@ Fl_Return_Button *codeblock_panel_ok=(Fl_Return_Button *)0; Fl_Button *codeblock_panel_cancel=(Fl_Button *)0; -Fl_Window* make_codeblock_panel() { - Fl_Window* w; - { Fl_Window* o = codeblock_panel = new Fl_Window(300, 115, "Code Block Properties"); +Fl_Double_Window* make_codeblock_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = codeblock_panel = new Fl_Double_Window(300, 115, "Code Block Properties"); w = o; o->labelsize(11); { Fl_Input* o = code_before_input = new Fl_Input(10, 15, 280, 20, "Conditional code block"); @@ -214,7 +214,7 @@ Fl_Window* make_codeblock_panel() { return w; } -Fl_Window *declblock_panel=(Fl_Window *)0; +Fl_Double_Window *declblock_panel=(Fl_Double_Window *)0; Fl_Input *decl_before_input=(Fl_Input *)0; @@ -226,9 +226,9 @@ Fl_Button *declblock_panel_cancel=(Fl_Button *)0; Fl_Light_Button *declblock_public_button=(Fl_Light_Button *)0; -Fl_Window* make_declblock_panel() { - Fl_Window* w; - { Fl_Window* o = declblock_panel = new Fl_Window(300, 135, "Declaration Block Properties"); +Fl_Double_Window* make_declblock_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = declblock_panel = new Fl_Double_Window(300, 135, "Declaration Block Properties"); w = o; o->labelsize(11); { Fl_Input* o = decl_before_input = new Fl_Input(10, 40, 280, 20); @@ -280,7 +280,7 @@ Fl_Window* make_declblock_panel() { return w; } -Fl_Window *decl_panel=(Fl_Window *)0; +Fl_Double_Window *decl_panel=(Fl_Double_Window *)0; Fl_Light_Button *decl_public_button=(Fl_Light_Button *)0; @@ -290,9 +290,9 @@ Fl_Return_Button *decl_panel_ok=(Fl_Return_Button *)0; Fl_Button *decl_panel_cancel=(Fl_Button *)0; -Fl_Window* make_decl_panel() { - Fl_Window* w; - { Fl_Window* o = decl_panel = new Fl_Window(290, 150, "Declaration Properties"); +Fl_Double_Window* make_decl_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = decl_panel = new Fl_Double_Window(290, 150, "Declaration Properties"); w = o; { Fl_Group* o = new Fl_Group(10, 10, 270, 20); { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); @@ -336,7 +336,7 @@ Fl_Window* make_decl_panel() { return w; } -Fl_Window *class_panel=(Fl_Window *)0; +Fl_Double_Window *class_panel=(Fl_Double_Window *)0; Fl_Light_Button *c_public_button=(Fl_Light_Button *)0; @@ -348,9 +348,9 @@ Fl_Return_Button *c_panel_ok=(Fl_Return_Button *)0; Fl_Button *c_panel_cancel=(Fl_Button *)0; -Fl_Window* make_class_panel() { - Fl_Window* w; - { Fl_Window* o = class_panel = new Fl_Window(300, 140, "Class Properties"); +Fl_Double_Window* make_class_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = class_panel = new Fl_Double_Window(300, 140, "Class Properties"); w = o; o->labelsize(11); { Fl_Group* o = new Fl_Group(10, 10, 280, 20); @@ -404,7 +404,7 @@ Fl_Window* make_class_panel() { return w; } -Fl_Window *comment_panel=(Fl_Window *)0; +Fl_Double_Window *comment_panel=(Fl_Double_Window *)0; CodeEditor *comment_input=(CodeEditor *)0; @@ -420,9 +420,9 @@ Fl_Menu_Button *comment_predefined=(Fl_Menu_Button *)0; Fl_Button *comment_load=(Fl_Button *)0; -Fl_Window* make_comment_panel() { - Fl_Window* w; - { Fl_Window* o = comment_panel = new Fl_Window(550, 280, "Comment Properties"); +Fl_Double_Window* make_comment_panel() { + Fl_Double_Window* w; + { Fl_Double_Window* o = comment_panel = new Fl_Double_Window(550, 280, "Comment Properties"); w = o; o->labelsize(11); { CodeEditor* o = comment_input = new CodeEditor(110, 10, 430, 230); diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl index 3c4579aa5..5e4060b01 100644 --- a/fluid/function_panel.fl +++ b/fluid/function_panel.fl @@ -28,7 +28,7 @@ comment {// // // http://www.fltk.org/str.php // -} {in_source in_header +} {selected in_source in_header } decl {\#include } {} @@ -47,7 +47,7 @@ Function {make_function_panel()} {open } { Fl_Window function_panel { label {Function/Method Properties} - xywh {419 200 290 150} type Single hide resizable + xywh {419 200 290 150} type Double hide resizable code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal } { Fl_Group {} {open @@ -95,7 +95,7 @@ Function {make_code_panel()} {open } { Fl_Window code_panel { label {Code Properties} - xywh {353 262 540 180} type Single labelsize 11 hide resizable + xywh {353 262 540 180} type Double labelsize 11 hide resizable code0 {o->size_range(200, 150);} modal } { Fl_Text_Editor code_input { @@ -126,7 +126,7 @@ Function {make_codeblock_panel()} {open } { Fl_Window codeblock_panel { label {Code Block Properties} - xywh {468 221 300 115} type Single labelsize 11 hide resizable + xywh {468 221 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 { @@ -159,7 +159,7 @@ Function {make_declblock_panel()} {open } { Fl_Window declblock_panel { label {Declaration Block Properties} - xywh {428 215 300 135} type Single labelsize 11 hide resizable + xywh {428 215 300 135} type Double labelsize 11 hide resizable code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal } { Fl_Input decl_before_input { @@ -202,7 +202,7 @@ Function {make_decl_panel()} {open } { Fl_Window decl_panel { label {Declaration Properties} - xywh {412 206 290 150} type Single hide resizable + xywh {412 206 290 150} type Double hide resizable code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} } { Fl_Group {} {open @@ -242,7 +242,7 @@ Function {make_class_panel()} {open } { Fl_Window class_panel { label {Class Properties} - xywh {449 218 300 140} type Single labelsize 11 hide resizable + xywh {449 218 300 140} type Double labelsize 11 hide resizable code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal } { Fl_Group {} {open @@ -286,10 +286,10 @@ Function {make_comment_panel()} {open } { Fl_Window comment_panel { label {Comment Properties} - xywh {422 190 550 280} type Single labelsize 11 hide resizable + xywh {422 190 550 280} type Double labelsize 11 hide resizable code0 {o->size_range(320, 180);} modal } { - Fl_Text_Editor comment_input {selected + Fl_Text_Editor comment_input { xywh {110 10 430 230} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable code0 {o->when(FL_WHEN_ENTER_KEY_CHANGED|FL_WHEN_RELEASE);} class CodeEditor diff --git a/fluid/function_panel.h b/fluid/function_panel.h index b2e7d8f2e..e0e315e03 100644 --- a/fluid/function_panel.h +++ b/fluid/function_panel.h @@ -30,8 +30,8 @@ #ifndef function_panel_h #define function_panel_h #include -#include -extern Fl_Window *function_panel; +#include +extern Fl_Double_Window *function_panel; #include #include extern Fl_Light_Button *f_public_button; @@ -44,40 +44,40 @@ extern Fl_Input *f_return_type_input; extern Fl_Return_Button *f_panel_ok; #include extern Fl_Button *f_panel_cancel; -Fl_Window* make_function_panel(); -extern Fl_Window *code_panel; +Fl_Double_Window* make_function_panel(); +extern Fl_Double_Window *code_panel; #include "CodeEditor.h" extern CodeEditor *code_input; extern Fl_Return_Button *code_panel_ok; extern Fl_Button *code_panel_cancel; -Fl_Window* make_code_panel(); -extern Fl_Window *codeblock_panel; +Fl_Double_Window* make_code_panel(); +extern Fl_Double_Window *codeblock_panel; extern Fl_Input *code_before_input; extern Fl_Input *code_after_input; extern Fl_Return_Button *codeblock_panel_ok; extern Fl_Button *codeblock_panel_cancel; -Fl_Window* make_codeblock_panel(); -extern Fl_Window *declblock_panel; +Fl_Double_Window* make_codeblock_panel(); +extern Fl_Double_Window *declblock_panel; extern Fl_Input *decl_before_input; extern Fl_Input *decl_after_input; extern Fl_Return_Button *declblock_panel_ok; extern Fl_Button *declblock_panel_cancel; extern Fl_Light_Button *declblock_public_button; -Fl_Window* make_declblock_panel(); -extern Fl_Window *decl_panel; +Fl_Double_Window* make_declblock_panel(); +extern Fl_Double_Window *decl_panel; extern Fl_Light_Button *decl_public_button; extern Fl_Input *decl_input; extern Fl_Return_Button *decl_panel_ok; extern Fl_Button *decl_panel_cancel; -Fl_Window* make_decl_panel(); -extern Fl_Window *class_panel; +Fl_Double_Window* make_decl_panel(); +extern Fl_Double_Window *class_panel; extern Fl_Light_Button *c_public_button; extern Fl_Input *c_name_input; extern Fl_Input *c_subclass_input; extern Fl_Return_Button *c_panel_ok; extern Fl_Button *c_panel_cancel; -Fl_Window* make_class_panel(); -extern Fl_Window *comment_panel; +Fl_Double_Window* make_class_panel(); +extern Fl_Double_Window *comment_panel; extern CodeEditor *comment_input; extern Fl_Return_Button *comment_panel_ok; extern Fl_Button *comment_panel_cancel; @@ -86,8 +86,9 @@ extern Fl_Light_Button *comment_in_header; #include extern Fl_Menu_Button *comment_predefined; extern Fl_Button *comment_load; -Fl_Window* make_comment_panel(); +Fl_Double_Window* make_comment_panel(); void type_make_cb(Fl_Widget*w,void*d); +#include extern Fl_Window *widgetbin_panel; extern void type_make_cb(Fl_Button*, void*); Fl_Window* make_widgetbin();