[paragui-cvs] CVS: paragui/src/layout layoutparsers.cpp,1.5.2.1,1.5.2.2 pgxmllayoutloader.cpp,1.6.2.2,1.6.2.3

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/layout
In directory subversions:/tmp/cvs-serv9570/src/layout

Modified Files:
      Tag: devel-opengl
        layoutparsers.cpp pgxmllayoutloader.cpp 
Log Message:
- some PG_ListBox fixes



Index: layoutparsers.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/layout/layoutparsers.cpp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** layoutparsers.cpp   30 Oct 2002 19:56:28 -0000      1.5.2.1
--- layoutparsers.cpp   4 Nov 2002 23:04:34 -0000       1.5.2.2
***************
*** 12,32 ****
        
        int w, h;
!       
        SetText(xmltag.GetString("text").c_str());
        
        PG_Rect pos = xmltag.GetRect("pos", GetParent());
        
        w = xmltag.GetInt("width");
        h = xmltag.GetInt("height");
        
!       if(w > 0) {
!               pos.w = w;
        }
        
!       if(h > 0) {
!               pos.h = h;
        }
-       
-       MoveWidget(pos);
        
        int x = xmltag.GetInt("id");
--- 12,42 ----
        
        int w, h;
! 
!       if(xmltag.GetString("name") != "") {
!               SetName(xmltag.GetString("name").c_str());
!       }
        SetText(xmltag.GetString("text").c_str());
        
        PG_Rect pos = xmltag.GetRect("pos", GetParent());
        
+       if(pos.x != 0 && pos.y != 0) {
+               PG_LogDBG("MoveWidget: %i,%i,%i,%i", pos.x, pos.y, pos.w, 
pos.h);
+               MoveWidget(pos);
+       }
+       
        w = xmltag.GetInt("width");
        h = xmltag.GetInt("height");
        
!       if(w <= 0) {
!               w = this->w;
        }
        
!       if(h <= 0) {
!               h = this->h;
!       }
! 
!       if(w > 0 || h > 0) {
!               SizeWidget(w, h);
        }
        
        int x = xmltag.GetInt("id");

Index: pgxmllayoutloader.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/layout/pgxmllayoutloader.cpp,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** pgxmllayoutloader.cpp       31 Oct 2002 10:38:04 -0000      1.6.2.2
--- pgxmllayoutloader.cpp       4 Nov 2002 23:04:34 -0000       1.6.2.3
***************
*** 285,289 ****
        // fac-to-ry
        if(xmltag.section == BODY || xmltag.section == WIDGET) {
!               PG_LogDBG("createobject (parent = 0x%08x)", parser->parent);
                parser->currentwidget = PG_Factory::CreateObject(xmltag.name, 
parser->parent);
        
--- 285,289 ----
        // fac-to-ry
        if(xmltag.section == BODY || xmltag.section == WIDGET) {
!               PG_LogDBG("createobject '%s' (parent = 0x%08x)", 
xmltag.name.c_str(), parser->parent);
                parser->currentwidget = PG_Factory::CreateObject(xmltag.name, 
parser->parent);