Author: manolo
Date: 2011-12-06 03:01:01 -0800 (Tue, 06 Dec 2011)
New Revision: 9195
Log:
Imported changes from 1.3
Modified:
branches/branch-3.0/src/fltk3/cocoa.mm
branches/branch-3.0/src/fltk3/x11.cxx
Modified: branches/branch-3.0/src/fltk3/cocoa.mm
===================================================================
--- branches/branch-3.0/src/fltk3/cocoa.mm 2011-12-04 11:20:28 UTC (rev
9194)
+++ branches/branch-3.0/src/fltk3/cocoa.mm 2011-12-06 11:01:01 UTC (rev
9195)
@@ -2030,7 +2030,7 @@
wp += 2*bx;
hp += 2*by+bt;
}
- if (w->flags() & fltk3::Window::FORCE_POSITION) {
+ if (w->force_position()) {
if (!fltk3::grab()) {
xp = xwm; yp = ywm;
w->x(xp);w->y(yp);
@@ -2076,7 +2076,7 @@
[cw setLevel:winlevel];
q_set_window_title(cw, w->label(), w->iconlabel());
- if (!(w->flags() & fltk3::Window::FORCE_POSITION)) {
+ if (!w->force_position()) {
if (w->modal()) {
[cw center];
} else if (w->non_modal()) {
@@ -2217,7 +2217,10 @@
// printf("fltk3::Window::resize(X=%d, Y=%d, W=%d, H=%d), is_a_resize=%d,
resize_from_system=%p, this=%p\n",
// X, Y, W, H, is_a_resize, resize_from_system, this);
if (X != x() || Y != y()) set_flag(FORCE_POSITION);
- else if (!is_a_resize) return;
+ else if (!is_a_resize) {
+ resize_from_system = 0;
+ return;
+ }
if ( (resize_from_system!=this) && (!parent()) && shown()) {
if (is_a_resize) {
if (resizable()) {
Modified: branches/branch-3.0/src/fltk3/x11.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/x11.cxx 2011-12-04 11:20:28 UTC (rev
9194)
+++ branches/branch-3.0/src/fltk3/x11.cxx 2011-12-06 11:01:01 UTC (rev
9195)
@@ -1682,7 +1682,7 @@
if (!win->parent() && !fltk3::grab()) {
// center windows in case window manager does not do anything:
#ifdef FL_CENTER_WINDOWS
- if (!(win->flags() & fltk3::Widget::FORCE_POSITION)) {
+ if (!win->force_position()) {
win->x(X = scr_x+(scr_w-W)/2);
win->y(Y = scr_y+(scr_h-H)/2);
}
@@ -1896,7 +1896,7 @@
prop[1] = 1|2|16; // MWM_FUNC_ALL | MWM_FUNC_RESIZE | MWM_FUNC_MAXIMIZE
}
- if (w->flags() & fltk3::Widget::FORCE_POSITION) {
+ if (w->force_position()) {
hints->flags |= USPosition;
hints->x = w->x();
hints->y = w->y();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
