Mercurial > octave

comparison libgui/graphics/ToolBar.cc @ 31647:431f80aba37a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 15:37:43 -0500
parents ca7d58406f82 c6d54dd31a7e
children deb553ac2c54
comparison
equal deleted inserted replaced
31645:bd9da634f00d 31647:431f80aba37a
41 #include "ToolBar.h" 41 #include "ToolBar.h"
42 #include "QtHandlesUtils.h" 42 #include "QtHandlesUtils.h"
43 43
44 #include "gui-preferences-global.h" 44 #include "gui-preferences-global.h"
45 45
46 namespace octave 46 OCTAVE_BEGIN_NAMESPACE(octave)
47 { 47
48 static QIcon makeEmptyIcon (void) 48 static QIcon makeEmptyIcon (void)
49 { 49 {
50 QPixmap pix (16, 16); 50 QPixmap pix (16, 16);
51 51
52 pix.fill (Qt::transparent); 52 pix.fill (Qt::transparent);
93 93
94 bar->setFloatable (false); 94 bar->setFloatable (false);
95 bar->setMovable (false); 95 bar->setMovable (false);
96 bar->setVisible (tp.is_visible ()); 96 bar->setVisible (tp.is_visible ());
97 bar->setStyleSheet (bar->styleSheet () + global_toolbar_style); 97 bar->setStyleSheet (bar->styleSheet () + global_toolbar_style);
98
99 98
100 m_empty = addEmptyAction (bar); 99 m_empty = addEmptyAction (bar);
101 100
102 m_figure = 101 m_figure =
103 dynamic_cast<Figure *> (Object::fromQObject (bar->parentWidget ())); 102 dynamic_cast<Figure *> (Object::fromQObject (bar->parentWidget ()));
184 if (bar) 183 if (bar)
185 m_figure->showCustomToolBar (bar, false); 184 m_figure->showCustomToolBar (bar, false);
186 } 185 }
187 } 186 }
188 187
189 } 188 OCTAVE_END_NAMESPACE(octave)