summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--src/Fl_arg.cxx4
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index bcb015e7f..6afa212fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745)
+ - Fl_Window::show(argc, argv) now sets the scheme before
+ showing the window; this should eliminate any
+ flickering between the standard and plastic schemes on
+ startup.
- Selected tabs are now drawn slightly larger than
unselected tabs so they stand out more (STR #882)
- FL_PLASTIC_DOWN_BOX drew with artifacts (STR #852)
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx
index ba79f74ac..c6b2e60a7 100644
--- a/src/Fl_arg.cxx
+++ b/src/Fl_arg.cxx
@@ -233,13 +233,15 @@ void Fl_Window::show(int argc, char **argv) {
if (title) {label(title); title = 0;}
else if (!label()) label(xclass());
- show();
if (!beenhere) {
beenhere = 1;
Fl::scheme(Fl::scheme()); // opens display! May call Fl::fatal()
}
+ // Show the window AFTER we have set the colors and scheme.
+ show();
+
#if !defined(WIN32) && !defined(__APPLE__)
// set the command string, used by state-saving window managers:
int j;