[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.8.2.4,1.8.2.5 pgco
|
From: |
Teunis Peters <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.8.2.4,1.8.2.5 pgcolumnitem.cpp,1.3.2.3,1.3.2.4 pgimage.cpp,1.3.2.2,1.3.2.3 pglabel.cpp,1.4.2.2,1.4.2.3 pglayout.cpp,1.2.2.3,1.2.2.4 pglineedit.cpp,1.6.2.4,1.6.2.5 pgthemewidget.cpp,1.6.2.4,1.6.2.5 pgwidget.cpp,1.13.2.5,1.13.2.6 pgwidgetdnd.cpp,1.3.2.3,1.3.2.4 pgwindow.cpp,1.10.2.3,1.10.2.4 |
|
Date: |
Wed, 30 Oct 2002 04:16:32 -0500 |
Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv26981/src/widgets
Modified Files:
Tag: devel-opengl
pgbutton.cpp pgcolumnitem.cpp pgimage.cpp pglabel.cpp
pglayout.cpp pglineedit.cpp pgthemewidget.cpp pgwidget.cpp
pgwidgetdnd.cpp pgwindow.cpp
Log Message:
Updating function names to be more consistent with ParaGUI
There's a persistant memory bug - somewhere - which is attempting to delete
information already deleted. Not all demos exhibit this, but paratest is
amongst those that do.
Significant rewrite of most of OpenGL driver. There's still more to be done
and the driver as yet does not work correctly. Any help would be quite
appreciated but as I haven't received anything more than a couple comments yet
I'm not holding my breath - T.
Index: pgbutton.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgbutton.cpp,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** pgbutton.cpp 7 Oct 2002 22:23:26 -0000 1.8.2.4
--- pgbutton.cpp 30 Oct 2002 09:16:29 -0000 1.8.2.5
***************
*** 640,650 ****
if(iconsrf) {
! int dx = my_text.empty() ? (rect.my_width -
iconsrf->getScreen()->w) >> 1 : 3;
! int dy = (rect.my_height - iconsrf->getScreen()->h) >> 1;
r.my_xpos = rect.my_xpos + dx + shift;
r.my_ypos = rect.my_ypos + dy + shift;
! r.my_width = iconsrf->getScreen()->w;
! r.my_height = iconsrf->getScreen()->h;
// calc new cliprect for icon
--- 640,650 ----
if(iconsrf) {
! int dx = my_text.empty() ? (rect.my_width -
iconsrf->GetWidth()) >> 1 : 3;
! int dy = (rect.my_height - iconsrf->GetHeight()) >> 1;
r.my_xpos = rect.my_xpos + dx + shift;
r.my_ypos = rect.my_ypos + dy + shift;
! r.my_width = iconsrf->GetWidth();
! r.my_height = iconsrf->GetHeight();
// calc new cliprect for icon
***************
*** 654,658 ****
my_srfScreen->BlitSurface(iconsrf, my_src, my_dst);
! tw -= (iconsrf->getScreen()->w + 3);
}
--- 654,658 ----
my_srfScreen->BlitSurface(iconsrf, my_src, my_dst);
! tw -= (iconsrf->GetWidth() + 3);
}
***************
*** 665,670 ****
int ty = ((my_height - h)/2) + shift;
! if (iconsrf /*&& tx < (iconsrf->getScreen()->w + 3)*/)
! tx += iconsrf->getScreen()->w + 3;
DrawText(tx, ty, my_text.c_str());
--- 665,670 ----
int ty = ((my_height - h)/2) + shift;
! if (iconsrf /*&& tx < (iconsrf->GetWidth() + 3)*/)
! tx += iconsrf->GetWidth() + 3;
DrawText(tx, ty, my_text.c_str());
Index: pgcolumnitem.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgcolumnitem.cpp,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** pgcolumnitem.cpp 7 Oct 2002 22:23:26 -0000 1.3.2.3
--- pgcolumnitem.cpp 30 Oct 2002 09:16:29 -0000 1.3.2.4
***************
*** 69,73 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if(my_srfIcon != NULL) {
! xshift = my_srfIcon->getScreen()->w;
}
--- 69,73 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if(my_srfIcon != NULL) {
! xshift = my_srfIcon->GetWidth();
}
Index: pgimage.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgimage.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** pgimage.cpp 7 Oct 2002 22:23:26 -0000 1.3.2.2
--- pgimage.cpp 30 Oct 2002 09:16:29 -0000 1.3.2.3
***************
*** 36,40 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if(my_image != NULL) {
! SizeWidget(my_image->getScreen()->w, my_image->getScreen()->h);
}
}
--- 36,40 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if(my_image != NULL) {
! SizeWidget(my_image->GetWidth(), my_image->GetHeight());
}
}
***************
*** 45,49 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if(my_image != NULL) {
! SizeWidget(my_image->getScreen()->w, my_image->getScreen()->h);
}
}
--- 45,49 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if(my_image != NULL) {
! SizeWidget(my_image->GetWidth(), my_image->GetHeight());
}
}
***************
*** 57,61 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! if(my_image->getScreen()->w != 0 && my_image->getScreen()->h != 0) {
PG_Rect my_src;
PG_Rect my_dst;
--- 57,61 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! if(my_image->GetWidth() != 0 && my_image->GetHeight() != 0) {
PG_Rect my_src;
PG_Rect my_dst;
Index: pglabel.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglabel.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** pglabel.cpp 7 Oct 2002 22:23:26 -0000 1.4.2.2
--- pglabel.cpp 30 Oct 2002 09:16:29 -0000 1.4.2.3
***************
*** 82,92 ****
// should we blit an icon ?
if(my_srfIcon != NULL) {
! xshift = my_srfIcon->getScreen()->w + my_indent;
PG_Rect icon_rect(
my_xpos + my_indent,
! my_ypos + (my_height - my_srfIcon->getScreen()->h)/2,
! my_srfIcon->getScreen()->w,
! my_srfIcon->getScreen()->h);
PG_Rect icon_src;
--- 82,92 ----
// should we blit an icon ?
if(my_srfIcon != NULL) {
! xshift = my_srfIcon->GetWidth() + my_indent;
PG_Rect icon_rect(
my_xpos + my_indent,
! my_ypos + (my_height - my_srfIcon->GetHeight())/2,
! my_srfIcon->GetWidth(),
! my_srfIcon->GetHeight());
PG_Rect icon_src;
Index: pglayout.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglayout.cpp,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** pglayout.cpp 7 Oct 2002 22:23:26 -0000 1.2.2.3
--- pglayout.cpp 30 Oct 2002 09:16:29 -0000 1.2.2.4
***************
*** 142,146 ****
for(d = strtok(parm,","); d != NULL; d = strtok(NULL,",")) {
if(parent == NULL) {
! mx = ((i%2)==0) ? screen->getScreen()->w :
screen->getScreen()->h;
} else {
mx = ((i%2)==0) ? parent->w : parent->h;
--- 142,146 ----
for(d = strtok(parm,","); d != NULL; d = strtok(NULL,",")) {
if(parent == NULL) {
! mx = ((i%2)==0) ? screen->GetWidth() :
screen->GetHeight();
} else {
mx = ((i%2)==0) ? parent->w : parent->h;
***************
*** 156,159 ****
--- 156,160 ----
}
Rect.SetRect(r[0], r[1], r[2], r[3]);
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
free(parm);
}
***************
*** 244,247 ****
--- 245,249 ----
*XMLParser = *OldUserData;
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
free(OldUserData);
Index: pglineedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglineedit.cpp,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** pglineedit.cpp 7 Oct 2002 22:23:26 -0000 1.6.2.4
--- pglineedit.cpp 30 Oct 2002 09:16:29 -0000 1.6.2.5
***************
*** 101,105 ****
else {
PG_Rect src, dst;
! PG_Rect rect(x + GetCursorXPos(), y + (Height() -
my_srfTextCursor->getScreen()->h)/2, my_srfTextCursor->getScreen()->w,
my_srfTextCursor->getScreen()->h);
GetClipRects(src, dst, rect);
PG_Widget::eventBlit(my_srfTextCursor, src, dst);
--- 101,105 ----
else {
PG_Rect src, dst;
! PG_Rect rect(x + GetCursorXPos(), y + (Height() -
my_srfTextCursor->GetHeight())/2, my_srfTextCursor->GetWidth(),
my_srfTextCursor->GetHeight());
GetClipRects(src, dst, rect);
PG_Widget::eventBlit(my_srfTextCursor, src, dst);
Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** pgthemewidget.cpp 7 Oct 2002 22:23:26 -0000 1.6.2.4
--- pgthemewidget.cpp 30 Oct 2002 09:16:29 -0000 1.6.2.5
***************
*** 226,234 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! Uint32 c = SDL_MapRGB(
! my_background->getScreen()->format,
! (colorkey>>16) & 0xFF,
! (colorkey>>8) & 0xFF,
! colorkey & 0xFF);
my_background->SetColorKey(SDL_SRCCOLORKEY, c);
--- 226,232 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! Uint32 c = my_background->MapRGB((colorkey>>16) & 0xFF,
! (colorkey>>8) & 0xFF,
! colorkey & 0xFF);
my_background->SetColorKey(SDL_SRCCOLORKEY, c);
***************
*** 406,411 ****
} else if (my_internaldata->simplebackground) {
if(GetTransparency() < 255) {
! Uint32 c = SDL_MapRGBA(
! my_srfScreen->getScreen()->format,
my_internaldata->backgroundcolor.r,
my_internaldata->backgroundcolor.g,
--- 404,408 ----
} else if (my_internaldata->simplebackground) {
if(GetTransparency() < 255) {
! Uint32 c = my_srfScreen->MapRGBA(
my_internaldata->backgroundcolor.r,
my_internaldata->backgroundcolor.g,
***************
*** 480,496 ****
}
! Uint8 bpp = screen->getScreen()->format->BitsPerPixel;
! Uint32 Rmask = screen->getScreen()->format->Rmask;
! Uint32 Gmask = screen->getScreen()->format->Gmask;
! Uint32 Bmask = screen->getScreen()->format->Bmask;
Uint32 Amask = 0;
if(background != NULL) {
! if((background->getScreen()->format->Amask != 0) || ((bpp <
background->getScreen()->format->BitsPerPixel) && (bpp <= 8))) {
! bpp = background->getScreen()->format->BitsPerPixel;
! Rmask = background->getScreen()->format->Rmask;
! Gmask = background->getScreen()->format->Gmask;
! Bmask = background->getScreen()->format->Bmask;
! Amask = background->getScreen()->format->Amask;
}
}
--- 477,493 ----
}
! Uint8 bpp = screen->GetDepth();
! Uint32 Rmask = screen->GetFormat()->Rmask;
! Uint32 Gmask = screen->GetFormat()->Gmask;
! Uint32 Bmask = screen->GetFormat()->Bmask;
Uint32 Amask = 0;
if(background != NULL) {
! if((background->GetFormat()->Amask != 0) || ((bpp <
background->GetDepth()) && (bpp <= 8))) {
! bpp = background->GetDepth();
! Rmask = background->GetFormat()->Rmask;
! Gmask = background->GetFormat()->Gmask;
! Bmask = background->GetFormat()->Bmask;
! Amask = background->GetFormat()->Amask;
}
}
***************
*** 509,513 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if ( bpp == 8 )
! surface->SetPalette ( SDL_LOGPAL,
screen->getScreen()->format->palette->colors, 0, 256 );
if(surface) {
--- 506,510 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
if ( bpp == 8 )
! surface->SetPalette ( SDL_LOGPAL,
screen->GetFormat()->palette->colors, 0, 256 );
if(surface) {
Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -C2 -r1.13.2.5 -r1.13.2.6
*** pgwidget.cpp 7 Oct 2002 22:23:26 -0000 1.13.2.5
--- pgwidget.cpp 30 Oct 2002 09:16:29 -0000 1.13.2.6
***************
*** 223,226 ****
--- 223,227 ----
if (my_internaldata->userdata != NULL) {
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
free(my_internaldata->userdata);
}
***************
*** 430,445 ****
MoveRect(x, y);
! if(vertical.my_xpos + vertical.my_width > my_srfScreen->getScreen()->w)
{
! vertical.my_width = my_srfScreen->getScreen()->w -
vertical.my_xpos;
}
! if(vertical.my_ypos + vertical.my_height >
my_srfScreen->getScreen()->h) {
! vertical.my_height = my_srfScreen->getScreen()->h -
vertical.my_ypos;
}
! if(horizontal.my_xpos + horizontal.my_width >
my_srfScreen->getScreen()->w) {
! horizontal.my_width = my_srfScreen->getScreen()->w-
horizontal.my_xpos;
}
! if(horizontal.my_ypos + horizontal.my_height >
my_srfScreen->getScreen()->h) {
! horizontal.my_height = my_srfScreen->getScreen()->h -
horizontal.my_ypos;
}
--- 431,446 ----
MoveRect(x, y);
! if(vertical.my_xpos + vertical.my_width > my_srfScreen->GetWidth()) {
! vertical.my_width = my_srfScreen->GetWidth() - vertical.my_xpos;
}
! if(vertical.my_ypos + vertical.my_height > my_srfScreen->GetHeight()) {
! vertical.my_height = my_srfScreen->GetHeight() -
vertical.my_ypos;
}
! if(horizontal.my_xpos + horizontal.my_width > my_srfScreen->GetWidth())
{
! horizontal.my_width = my_srfScreen->GetWidth()-
horizontal.my_xpos;
}
! if(horizontal.my_ypos + horizontal.my_height >
my_srfScreen->GetHeight()) {
! horizontal.my_height = my_srfScreen->GetHeight() -
horizontal.my_ypos;
}
***************
*** 893,900 ****
if(y < 0)
y=0;
! if(x > (my_srfScreen->getScreen()->w - my_width -1))
! x = (my_srfScreen->getScreen()->w - my_width -1);
! if(y > (my_srfScreen->getScreen()->h - my_height -1))
! y = (my_srfScreen->getScreen()->h - my_height -1);
MoveWidget(x,y);
--- 894,901 ----
if(y < 0)
y=0;
! if(x > (my_srfScreen->GetWidth() - my_width -1))
! x = (my_srfScreen->GetWidth() - my_width -1);
! if(y > (my_srfScreen->GetHeight() - my_height -1))
! y = (my_srfScreen->GetHeight() - my_height -1);
MoveWidget(x,y);
***************
*** 1644,1648 ****
int x0 = PG_MAX(x, my_internaldata->rectClip.x);
int x1 = PG_MIN(x+w,
my_internaldata->rectClip.x+my_internaldata->rectClip.w);
! Uint32 c = SDL_MapRGB(surface->getScreen()->format, r, g, b);
int wl = (x1-x0);
--- 1645,1649 ----
int x0 = PG_MAX(x, my_internaldata->rectClip.x);
int x1 = PG_MIN(x+w,
my_internaldata->rectClip.x+my_internaldata->rectClip.w);
! Uint32 c = surface->MapRGB(r, g, b);
int wl = (x1-x0);
***************
*** 1680,1684 ****
int y0 = PG_MAX(y, my_internaldata->rectClip.y);
int y1 = PG_MIN(y+h,
my_internaldata->rectClip.y+my_internaldata->rectClip.h);
! Uint32 c = SDL_MapRGB(surface->getScreen()->format, r, g, b);
int hl = (y1-y0);
--- 1681,1685 ----
int y0 = PG_MAX(y, my_internaldata->rectClip.y);
int y1 = PG_MIN(y+h,
my_internaldata->rectClip.y+my_internaldata->rectClip.h);
! Uint32 c = surface->MapRGB(r, g, b);
int hl = (y1-y0);
Index: pgwidgetdnd.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetdnd.cpp,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** pgwidgetdnd.cpp 7 Oct 2002 22:23:26 -0000 1.3.2.3
--- pgwidgetdnd.cpp 30 Oct 2002 09:16:29 -0000 1.3.2.4
***************
*** 171,175 ****
if(dragimage != NULL) {
dragimagecache =
!
PG_Application::GetDrawingEnvironment()->CreateDrawableSurface(dragimage->getScreen()->w,
dragimage->getScreen()->h);
}
--- 171,175 ----
if(dragimage != NULL) {
dragimagecache =
!
PG_Application::GetDrawingEnvironment()->CreateDrawableSurface(dragimage->GetWidth(),
dragimage->GetHeight());
}
***************
*** 318,328 ****
srcrect.x = p.x;
srcrect.y = p.y;
! srcrect.w = dragimagecache->getScreen()->w;
! srcrect.h = dragimagecache->getScreen()->h;
dstrect.x = 0;
dstrect.y = 0;
! dstrect.w = dragimagecache->getScreen()->w;
! dstrect.h = dragimagecache->getScreen()->h;
dragimagecache->BlitSurface(GetScreenSurface(), srcrect, dstrect);
--- 318,328 ----
srcrect.x = p.x;
srcrect.y = p.y;
! srcrect.w = dragimagecache->GetWidth();
! srcrect.h = dragimagecache->GetHeight();
dstrect.x = 0;
dstrect.y = 0;
! dstrect.w = dragimagecache->GetWidth();
! dstrect.h = dragimagecache->GetHeight();
dragimagecache->BlitSurface(GetScreenSurface(), srcrect, dstrect);
***************
*** 344,354 ****
srcrect.x = 0;
srcrect.y = 0;
! srcrect.w = dragimagecache->getScreen()->w;
! srcrect.h = dragimagecache->getScreen()->h;
dstrect.x = p.x;
dstrect.y = p.y;
! dstrect.w = dragimagecache->getScreen()->w;
! dstrect.h = dragimagecache->getScreen()->h;
GetScreenSurface()->BlitSurface(dragimagecache, srcrect, dstrect);
--- 344,354 ----
srcrect.x = 0;
srcrect.y = 0;
! srcrect.w = dragimagecache->GetWidth();
! srcrect.h = dragimagecache->GetHeight();
dstrect.x = p.x;
dstrect.y = p.y;
! dstrect.w = dragimagecache->GetWidth();
! dstrect.h = dragimagecache->GetHeight();
GetScreenSurface()->BlitSurface(dragimagecache, srcrect, dstrect);
***************
*** 363,368 ****
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! x -= dragimage->getScreen()->w / 2;
! y -= dragimage->getScreen()->h / 2;
if(x<0)
--- 363,368 ----
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! x -= dragimage->GetWidth() / 2;
! y -= dragimage->GetHeight() / 2;
if(x<0)
***************
*** 371,379 ****
y=0;
! if(x + dragimage->getScreen()->w > GetScreenSurface()->getScreen()->w)
! x = GetScreenSurface()->getScreen()->w -
dragimage->getScreen()->w;
! if(y + dragimage->getScreen()->h > GetScreenSurface()->getScreen()->h)
! y = GetScreenSurface()->getScreen()->h -
dragimage->getScreen()->h;
}
--- 371,379 ----
y=0;
! if(x + dragimage->GetWidth() > GetScreenSurface()->GetWidth())
! x = GetScreenSurface()->GetWidth() - dragimage->GetWidth();
! if(y + dragimage->GetHeight() > GetScreenSurface()->GetHeight())
! y = GetScreenSurface()->GetHeight() - dragimage->GetHeight();
}
***************
*** 390,400 ****
srcrect.x = 0;
srcrect.y = 0;
! srcrect.w = image->getScreen()->w;
! srcrect.h = image->getScreen()->h;
dstrect.x = pt.x;
dstrect.y = pt.y;
! dstrect.w = image->getScreen()->w;
! dstrect.h = image->getScreen()->h;
PG_Application::LockScreen();
--- 390,400 ----
srcrect.x = 0;
srcrect.y = 0;
! srcrect.w = image->GetWidth();
! srcrect.h = image->GetHeight();
dstrect.x = pt.x;
dstrect.y = pt.y;
! dstrect.w = image->GetWidth();
! dstrect.h = image->GetHeight();
PG_Application::LockScreen();
***************
*** 410,415 ****
dstrect.x = pt.x;
dstrect.y = pt.y;
! dstrect.w = image->getScreen()->w;
! dstrect.h = image->getScreen()->h;
GetScreenSurface()->UpdateRects(1, &dstrect);
--- 410,415 ----
dstrect.x = pt.x;
dstrect.y = pt.y;
! dstrect.w = image->GetWidth();
! dstrect.h = image->GetHeight();
GetScreenSurface()->UpdateRects(1, &dstrect);
Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C2 -r1.10.2.3 -r1.10.2.4
*** pgwindow.cpp 7 Oct 2002 22:23:26 -0000 1.10.2.3
--- pgwindow.cpp 30 Oct 2002 09:16:29 -0000 1.10.2.4
***************
*** 160,167 ****
y=0;
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! if(x > (my_srfScreen->getScreen()->w - my_width - 1))
! x = (my_srfScreen->getScreen()->w - my_width - 1);
! if(y > (my_srfScreen->getScreen()->h - my_height - 1))
! y = (my_srfScreen->getScreen()->h - my_height -1);
if(my_moveMode) {
--- 160,167 ----
y=0;
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! if(x > (my_srfScreen->GetWidth() - my_width - 1))
! x = (my_srfScreen->GetWidth() - my_width - 1);
! if(y > (my_srfScreen->GetHeight() - my_height - 1))
! y = (my_srfScreen->GetHeight() - my_height -1);
if(my_moveMode) {
***************
*** 196,203 ****
y = GetParent()->Height() - 5;
} else { // A top-level-widget
! if(x > (my_srfScreen->getScreen()->w - my_width - 1))
! x = (my_srfScreen->getScreen()->w - my_width - 1);
! if(y > (my_srfScreen->getScreen()->h - my_height - 1))
! y = (my_srfScreen->getScreen()->h - my_height - 1);
}
--- 196,203 ----
y = GetParent()->Height() - 5;
} else { // A top-level-widget
! if(x > (my_srfScreen->GetWidth() - my_width - 1))
! x = (my_srfScreen->GetWidth() - my_width - 1);
! if(y > (my_srfScreen->GetHeight() - my_height - 1))
! y = (my_srfScreen->GetHeight() - my_height - 1);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.8.2.4,1.8.2.5 pgcolumnitem.cpp,1.3.2.3,1.3.2.4 pgimage.cpp,1.3.2.2,1.3.2.3 pglabel.cpp,1.4.2.2,1.4.2.3 pglayout.cpp,1.2.2.3,1.2.2.4 pglineedit.cpp,1.6.2.4,1.6.2.5 pgthemewidget.cpp,1.6.2.4,1.6.2.5 pgwidget.cpp,1.13.2.5,1.13.2.6 pgwidgetdnd.cpp,1.3.2.3,1.3.2.4 pgwindow.cpp,1.10.2.3,1.10.2.4,
Teunis Peters <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/core pgattrib.cpp,NONE,1.1.2.1 Makefile.am,1.4.2.3,1.4.2.4 pgapplication.cpp,1.10.2.9,1.10.2.10 pgfilearchive.cpp,1.4.2.5,1.4.2.6
- Next by Date:
[paragui-cvs] CVS: paragui/include Makefile.am,1.6.2.3,1.6.2.4
- Previous by thread:
[paragui-cvs] CVS: paragui/src/core pgattrib.cpp,NONE,1.1.2.1 Makefile.am,1.4.2.3,1.4.2.4 pgapplication.cpp,1.10.2.9,1.10.2.10 pgfilearchive.cpp,1.4.2.5,1.4.2.6
- Next by thread:
[paragui-cvs] CVS: paragui/include Makefile.am,1.6.2.3,1.6.2.4
- Index(es):