Mercurial > octave-nkf

comparison libgui/graphics/Figure.cc @ 20566:dcfbf4c1c3c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate trailing whitespace and tabs from sources * Canvas.cc, Canvas.h, Figure.cc, gl-render.h, graphics.cc, ov-fcn-handle.cc, ov-java.cc, Range.cc, CmplxCHOL.cc, dbleCHOL.cc, floatCHOL.cc: Eliminate trailing whitespace and tabs used for indentation.
author John W. Eaton <jwe@octave.org>
date Thu, 01 Oct 2015 12:50:00 -0400
parents 88459dd6780f
children d0f886a030b7
comparison
equal deleted inserted replaced
20565:17e507df10e3 20566:dcfbf4c1c3c8
127 : Object (go, win), m_blockUpdates (false), m_figureToolBar (0), 127 : Object (go, win), m_blockUpdates (false), m_figureToolBar (0),
128 m_menuBar (0), m_innerRect (), m_outerRect (), m_mouseModeGroup (0) 128 m_menuBar (0), m_innerRect (), m_outerRect (), m_mouseModeGroup (0)
129 { 129 {
130 m_container = new Container (win); 130 m_container = new Container (win);
131 win->setCentralWidget (m_container); 131 win->setCentralWidget (m_container);
132 132
133 figure::properties& fp = properties<figure> (); 133 figure::properties& fp = properties<figure> ();
134 134
135 // Enable mouse tracking 135 // Enable mouse tracking
136 m_container->setMouseTracking (true); 136 m_container->setMouseTracking (true);
137 foreach (QWidget* w, m_container->findChildren<QWidget*> ()) 137 foreach (QWidget* w, m_container->findChildren<QWidget*> ())
138 { w->setMouseTracking (true); } 138 { w->setMouseTracking (true); }
139 139
140 // Status bar 140 // Status bar
141 m_statusBar = win->statusBar (); 141 m_statusBar = win->statusBar ();
142 int boffset = 0; 142 int boffset = 0;
143 143
144 // Toolbar and menubar 144 // Toolbar and menubar
149 (fp.toolbar_is ("auto") && fp.menubar_is ("figure") && 149 (fp.toolbar_is ("auto") && fp.menubar_is ("figure") &&
150 ! hasUiControlChildren (fp))) 150 ! hasUiControlChildren (fp)))
151 { 151 {
152 toffset += m_figureToolBar->sizeHint ().height (); 152 toffset += m_figureToolBar->sizeHint ().height ();
153 boffset += m_statusBar->sizeHint ().height (); 153 boffset += m_statusBar->sizeHint ().height ();
154 } 154 }
155 else 155 else
156 { 156 {
157 m_figureToolBar->hide (); 157 m_figureToolBar->hide ();
158 m_statusBar->hide (); 158 m_statusBar->hide ();
159 } 159 }
435 if (! tb->isHidden ()) 435 if (! tb->isHidden ())
436 toffset += tb->sizeHint ().height (); 436 toffset += tb->sizeHint ().height ();
437 437
438 if (! m_menuBar->isHidden ()) 438 if (! m_menuBar->isHidden ())
439 toffset += m_menuBar->sizeHint ().height () + 1; 439 toffset += m_menuBar->sizeHint ().height () + 1;
440 440
441 if (! m_statusBar->isHidden ()) 441 if (! m_statusBar->isHidden ())
442 boffset += m_statusBar->sizeHint ().height () + 1; 442 boffset += m_statusBar->sizeHint ().height () + 1;
443 443
444 win->setGeometry (m_innerRect.adjusted (0, -toffset, 0, boffset)); 444 win->setGeometry (m_innerRect.adjusted (0, -toffset, 0, boffset));
445 } 445 }