[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/widgets pgwindow.cpp,1.3.6.7,1.3.6.8
From: |
Alexander Pipelka <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui/src/widgets pgwindow.cpp,1.3.6.7,1.3.6.8 |
Date: |
Thu, 17 Apr 2003 04:28:52 -0400 |
Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv17788/src/widgets
Modified Files:
Tag: devel-1-0
pgwindow.cpp
Log Message:
window movement fixes
Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.3.6.7
retrieving revision 1.3.6.8
diff -C2 -r1.3.6.7 -r1.3.6.8
*** pgwindow.cpp 16 Apr 2003 09:21:39 -0000 1.3.6.7
--- pgwindow.cpp 17 Apr 2003 08:28:50 -0000 1.3.6.8
***************
*** 169,176 ****
if(y < 0)
y=0;
! if(x > (my_srfScreen->w - my_width - 1))
! x = (my_srfScreen->w - my_width - 1);
! if(y > (my_srfScreen->h - my_height - 1))
! y = (my_srfScreen->h - my_height -1);
if(my_moveMode) {
--- 169,176 ----
if(y < 0)
y=0;
! if(x+my_width > (my_srfScreen->w - my_width))
! x = (my_srfScreen->w - my_width);
! if(y+my_height > (my_srfScreen->h - my_height))
! y = (my_srfScreen->h - my_height);
if(my_moveMode) {
***************
*** 199,212 ****
x = pos.x;
y = pos.y; // Should not be moved out of the parent:
! if(x >= GetParent()->Width() - my_width - 1)
! x = GetParent()->Width() - my_width - 1;
! if(y >= GetParent()->Height() - my_height -1)
! y = GetParent()->Height() - my_height -1;
! } else { // A top-level-widget
! if(x > (my_srfScreen->w - my_width - 1))
! x = (my_srfScreen->w - my_width - 1);
! if(y > (my_srfScreen->h - my_height - 1))
! y = (my_srfScreen->h - my_height - 1);
}
if(x < 0)
--- 199,212 ----
x = pos.x;
y = pos.y; // Should not be moved out of the parent:
! if(x+my_width > GetParent()->Width())
! x = GetParent()->Width() - my_width;
! if(y+my_height > GetParent()->Height())
! y = GetParent()->Height() - my_height;
}
+
+ if(x+my_width > my_srfScreen->w)
+ x = (my_srfScreen->w - my_width);
+ if(y+my_height > my_srfScreen->h)
+ y = (my_srfScreen->h - my_height);
if(x < 0)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/widgets pgwindow.cpp,1.3.6.7,1.3.6.8,
Alexander Pipelka <address@hidden> <=