Author: matt
Date: 2010-04-11 02:52:05 -0700 (Sun, 11 Apr 2010)
New Revision: 7479
Log:
Apple Cocoa: modal windows would not resize.
Modified:
branches/branch-1.3/fluid/Fl_Widget_Type.cxx
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-1.3/fluid/Fl_Widget_Type.cxx 2010-04-10 22:16:55 UTC
(rev 7478)
+++ branches/branch-1.3/fluid/Fl_Widget_Type.cxx 2010-04-11 09:52:05 UTC
(rev 7479)
@@ -1188,7 +1188,6 @@
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
Fl_Align x = q->o->align();
Fl_Align y = (x & ~FL_ALIGN_POSITION_MASK) | b;
- //printf("x:%04x y:%04x b:%04x\n", x, y, b);
if (x != y) {
q->o->align(y);
q->redraw();
@@ -1787,6 +1786,7 @@
}
if (o->value()) {
if (numselected == 1) {
+ Fl_Group::current(0L);
live_widget = current_widget->enter_live_mode(1);
if (live_widget) {
live_type = current_widget;
@@ -1804,8 +1804,9 @@
Fl_Button *btn = new Fl_Button(10, h+20, 100, 25, "Exit Live Mode");
btn->labelsize(12);
btn->callback(leave_live_mode_cb);
+ rsz->end();
+ live_window->add(live_widget);
live_widget->position(10, 10);
- live_window->add(live_widget);
live_window->resizable(live_widget);
live_window->set_modal(); // block all other UI
live_window->callback(leave_live_mode_cb);
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2010-04-10 22:16:55 UTC (rev 7478)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2010-04-11 09:52:05 UTC (rev 7479)
@@ -2100,7 +2100,7 @@
winstyle |= NSResizableWindowMask;
}
} else {
- if (w->resizable()) {
+ if (w->resizable()) {
Fl_Widget *o = w->resizable();
int minw = o->w(); if (minw > 100) minw = 100;
int minh = o->h(); if (minh > 100) minh = 100;
@@ -2121,7 +2121,8 @@
winstyle = NSBorderlessWindowMask;
}
} else if (w->modal()) {
- winstyle &= ~(NSResizableWindowMask | NSMiniaturizableWindowMask);
+ winstyle &= ~NSMiniaturizableWindowMask;
+ // winstyle &= ~(NSResizableWindowMask | NSMiniaturizableWindowMask);
// winlevel = NSModalPanelWindowLevel;
}
else if (w->non_modal()) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
