Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-23 15:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed XFT layout problems in fluid/about_panel.fl (STR #2165) and copyright

Browse Source 
year. This is far from a complete solution for STR 2165, but it fixed the
most prominent issue (about_panel). It's done be enlarging some boxes and
the whole window.
M    fluid/about_panel.cxx


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8144 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser
2010-12-30 16:17:49 +00:00
parent e6a506d1f6
commit 0f42da625a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluid/about_panel.cxx
+5 -5
View File
@@ -271,28 +271,28 @@ static void cb_Close(Fl_Return_Button* o, void*) {
}
Fl_Double_Window* make_about_panel() {
{ about_panel = new Fl_Double_Window(315, 175, "About FLUID");
{ about_panel = new Fl_Double_Window(345, 180, "About FLUID");
about_panel->color(FL_LIGHT1);
about_panel->selection_color(FL_DARK1);
about_panel->hotspot(about_panel);
{ Fl_Box* o = new Fl_Box(10, 10, 115, 120);
o->image(image_fluid);
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(135, 10, 170, 69, "FLTK User\nInterface Designer\nVersion 1.3.0");
{ Fl_Box* o = new Fl_Box(135, 10, 200, 70, "FLTK User\nInterface Designer\nVersion 1.3.0");
o->color((Fl_Color)12);
o->selection_color(FL_DARK1);
o->labelfont(1);
o->labelsize(18);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(135, 89, 170, 42, "Copyright 1998-2009 by\nBill Spitzak and others");
{ Fl_Box* o = new Fl_Box(135, 90, 200, 45, "Copyright 1998-2010 by\nBill Spitzak and others");
o->align(Fl_Align(132|FL_ALIGN_INSIDE));
} // Fl_Box* o
{ Fl_Button* o = new Fl_Button(89, 141, 123, 25, "View License...");
{ Fl_Button* o = new Fl_Button(115, 145, 123, 25, "View License...");
o->labelcolor(FL_DARK_BLUE);
o->callback((Fl_Callback*)cb_View);
} // Fl_Button* o
{ Fl_Return_Button* o = new Fl_Return_Button(222, 141, 83, 25, "Close");
{ Fl_Return_Button* o = new Fl_Return_Button(250, 145, 83, 25, "Close");
o->callback((Fl_Callback*)cb_Close);
} // Fl_Return_Button* o
about_panel->set_non_modal();
fluid/about_panel.fl
+9 -9
View File
@@ -31,14 +31,14 @@ comment {//
} {in_source in_header
}
decl {void show_help(const char *name);} {public
decl {void show_help(const char *name);} {public local
}
Function {make_about_panel()} {selected
Function {make_about_panel()} {open
} {
Fl_Window about_panel {
label {About FLUID} open
xywh {419 216 315 175} type Double color 50 selection_color 47 hotspot non_modal visible
label {About FLUID} open selected
xywh {419 216 345 180} type Double color 50 selection_color 47 hotspot non_modal visible
} {
Fl_Box {} {
image {icons/fluid-96.xpm} xywh {10 10 115 120}
@@ -47,22 +47,22 @@ Function {make_about_panel()} {selected
label {FLTK User
Interface Designer
Version 1.3.0}
xywh {135 10 170 69} color 12 selection_color 47 labelfont 1 labelsize 18 align 21
xywh {135 10 200 70} color 12 selection_color 47 labelfont 1 labelsize 18 align 21
}
Fl_Box {} {
label {Copyright 1998-2009 by
label {Copyright 1998-2010 by
Bill Spitzak and others}
xywh {135 89 170 42} align 148
xywh {135 90 200 45} align 148
}
Fl_Button {} {
label {View License...}
callback {show_help("license.html");}
xywh {89 141 123 25} labelcolor 136
xywh {115 145 123 25} labelcolor 136
}
Fl_Return_Button {} {
label Close
callback {((Fl_Window*)(o->parent()))->hide();}
xywh {222 141 83 25}
xywh {250 145 83 25}
}
}
}