mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FLUID didn't set the initial size of widgets properly (STR #850) 

Fl_Tabs would steal focus away from its children on a window
focus change (STR #870)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4358 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-05-19 15:57:32 +00:00
parent 296efbe092
commit 13d8286b8a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -2,6 +2,10 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR - Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745) #744, STR #745)
- FLUID didn't set the initial size of widgets properly
(STR #850)
- Fl_Tabs would steal focus away from its children on a
window focus change (STR #870)
- filename_relative() now converts the current directory - filename_relative() now converts the current directory
to forward slashes as needed on WIN32 (STR #816) to forward slashes as needed on WIN32 (STR #816)
- Fl_File_Chooser::value() and ::directory() now handle - Fl_File_Chooser::value() and ::directory() now handle

2
fluid/factory.cxx
View File

@ -908,7 +908,7 @@ static void cb(Fl_Widget *, void *v) {
wt->textstuff(2, f, s, c); wt->textstuff(2, f, s, c);
// Resize and/or reposition new widget... // Resize and/or reposition new widget...
int w, h; int w = 0, h = 0;
wt->ideal_size(w, h); wt->ideal_size(w, h);
if (!strcmp(wt->type_name(), "Fl_Menu_Bar")) { if (!strcmp(wt->type_name(), "Fl_Menu_Bar")) {

7
src/Fl_Tabs.cxx
View File

@ -149,7 +149,9 @@ int Fl_Tabs::handle(int event) {
if (!Fl::visible_focus()) return Fl_Group::handle(event); if (!Fl::visible_focus()) return Fl_Group::handle(event);
if (Fl::event() == FL_RELEASE || if (Fl::event() == FL_RELEASE ||
Fl::event() == FL_SHORTCUT || Fl::event() == FL_SHORTCUT ||
Fl::event() == FL_KEYBOARD) { Fl::event() == FL_KEYBOARD ||
Fl::event() == FL_FOCUS ||
Fl::event() == FL_UNFOCUS) {
int H = tab_height(); int H = tab_height();
if (H >= 0) { if (H >= 0) {
H += Fl::box_dy(box()); H += Fl::box_dy(box());
@ -158,7 +160,8 @@ int Fl_Tabs::handle(int event) {
H = Fl::box_dy(box()) - H; H = Fl::box_dy(box()) - H;
damage(FL_DAMAGE_SCROLL, x(), y() + h() - H, w(), H); damage(FL_DAMAGE_SCROLL, x(), y() + h() - H, w(), H);
} }
return 1; if (Fl::event() == FL_FOCUS || Fl::event() == FL_UNFOCUS) return 0;
else return 1;
} else return Fl_Group::handle(event); } else return Fl_Group::handle(event);
case FL_KEYBOARD: case FL_KEYBOARD:
switch (Fl::event_key()) { switch (Fl::event_key()) {