Changeset cb6a2b7 in sasview


Ignore:
Timestamp:
Apr 21, 2013 10:28:22 AM (12 years ago)
Author:
Jae Cho <jhjcho@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
7d90e55
Parents:
4de587d
Message:

trying to fix datapanel scrollpanel issue on mac

Location:
sansguiframe/src/sans/guiframe
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sansguiframe/src/sans/guiframe/data_panel.py

    raf72b2e rcb6a2b7  
    130130                 list=None, 
    131131                 size=(PANEL_WIDTH, PANEL_HEIGHT), 
     132                 id=-1, 
    132133                 list_of_perspective=None, manager=None, *args, **kwds): 
    133134        kwds['size'] = size 
    134135        kwds['style'] = STYLE_FLAG 
    135         ScrolledPanel.__init__(self, parent=parent, *args, **kwds) 
     136        ScrolledPanel.__init__(self, parent=parent, id=id, *args, **kwds) 
    136137        PanelBase.__init__(self) 
    137138        self.SetupScrolling() 

  • sansguiframe/src/sans/guiframe/gui_manager.py

    r4de587d rcb6a2b7  
    981981        if not IS_WIN: 
    982982            x_pos, _ = frame.GetPositionTuple() 
    983             frame.SetPosition((x_pos, mac_pos_y + 72)) 
     983            frame.SetPosition((x_pos, mac_pos_y + 70)) 
    984984        frame.Show(True) 
    985985        #add data panel  
    986986         
    987987        #w, h = self._get_panels_size(self._data_panel) 
    988         win = MDIFrame(self, None, 'None') 
     988        win = MDIFrame(self, None, 'None', (100, 200)) 
    989989        #win.EnableCloseButton(False) 
    990990        self._data_panel = DataPanel(parent=win) 
    991991        win.set_panel(self._data_panel) 
     992        self._data_panel.set_frame(win) 
    992993        self.panels["data_panel"] = self._data_panel 
    993994        w, h = self._get_panels_size(self._data_panel) 
    994995        win.SetSize((w, h)) 
    995         self._data_panel.set_frame(win) 
    996996        style = self.__gui_style & GUIFRAME.MANAGER_ON 
    997997        if style != GUIFRAME.MANAGER_ON: 
    … …  
    10011001        if not IS_WIN: 
    10021002            x_pos, _ = win.GetPositionTuple() 
    1003             win.SetPosition((x_pos, mac_pos_y + 72)) 
     1003            win.SetPosition((x_pos, mac_pos_y + 70)) 
    10041004        win.Show(flag) 
    10051005        d_panel_width = w 
    … …  
    10251025            if not IS_WIN: 
    10261026                x_pos, _ = frame.GetPositionTuple() 
    1027                 frame.SetPosition((x_pos, mac_pos_y + 72)) 
     1027                frame.SetPosition((x_pos, mac_pos_y + 70)) 
    10281028 
    10291029        if not IS_WIN: 
Note: See TracChangeset for help on using the changeset viewer.