Changeset 3750

Show
Ignore:
Timestamp:
11/24/07 07:34:45 (1 year ago)
Author:
ed
Message:

Re-instated the storing of Height and Width for objects whose sizer properties are not set to Expand.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ide/ClassDesignerComponents.py

    r3670 r3750  
    140140                continue 
    141141            if (hasSizer or isinstance(self, dabo.ui.dPage) or isSplitPanel) and prop in ("Left", 
    142                     "Right", "Top", "Bottom", "Width", "Height"): 
     142                    "Right", "Top", "Bottom"):      #, "Width", "Height" 
     143                    ##"Right", "Top", "Bottom", "Width", "Height"): 
    143144                    ## Note: there may be additional cases where we might have to fine-tune 
    144145                    ## which if these parameters are skipped/included. 
    145                     ##"Right", "Top", "Bottom"):        #, "Width", "Height" 
     146                continue 
     147            if (hasSizer or isinstance(self, dabo.ui.dPage) or isSplitPanel) and prop in ("Width", 
     148                    "Height") and self.ControllingSizer.getItemProp(self, "Expand"): 
    146149                continue 
    147150            if prop == "BackColor" and isinstance(self, (LayoutPanel, LayoutSpacerPanel)): 
    …… 
    160163            if not prop in ("Alignment", "Caption", "DataField", "DataSource", 
    161164                    "FontFace", "HAlign", "Name", "RegID", "SelectionMode", 
    162                     "ToolTipText", "VAlign", "Value") and (not prop.startswith("Border") 
    163                     and not prop.startswith("Header") and not prop.startswith("Sizer_")): 
     165                    "ToolTipText", "VAlign", "Value") and ( 
     166                    not prop.startswith(("Border", "Header", "Sizer_"))): 
    164167                if isinstance(val, basestring) and os.path.exists(val): 
    165168                    # It's a path; convert it to a relative path