Mercurial > octave
changeset 27478:9e526393d80a
reduced vertical space in gui with responsive toolbar buttons (bug #53902)
* gui-preferences.h: new constants for tool und menu bar style sheets
which only affect tool and menu bar and not the items therein
* graphics/Figure.cc: include gui-preferences.h;
(Figure): set style sheet for menu bar with reduced vertical spacing
* graphics/ToolBar.cc: include gui-preferences.h;
(ToolBar): set style sheet for tool bar with reduced vertical spacing
* main-window.cc (construct_tool_bar): use style sheet string for tool bar
which was defined in gui-preferences.h
* octave-dock-widget.cc (handle_settings): newline for readability
* history-dock-widget.cc (construct): reduce spacing in the used layout
* workspace-view.cc (workspace_view): reduce spacing in the used layout
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sun, 06 Oct 2019 22:25:36 +0200 |
| parents | b470734a025e |
| children | e8c417f6ef83 |
| files | libgui/graphics/Figure.cc libgui/graphics/ToolBar.cc libgui/src/gui-preferences.h libgui/src/history-dock-widget.cc libgui/src/main-window.cc libgui/src/octave-dock-widget.cc libgui/src/workspace-view.cc |
| diffstat | 7 files changed, 21 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/graphics/Figure.cc Sun Oct 06 22:25:36 2019 +0200 @@ -53,6 +53,8 @@ #include "qt-interpreter-events.h" +#include "../src/gui-preferences.h" + #include "file-ops.h" #include "unwind-prot.h" #include "utils.h" @@ -137,6 +139,8 @@ m_menuBar = new MenuBar (win); win->setMenuBar (m_menuBar); m_menuBar->addReceiver (this); + m_menuBar->setStyleSheet (m_menuBar->styleSheet () + octgui_menubar_style); + // Status bar m_statusBar = win->statusBar ();
--- a/libgui/graphics/ToolBar.cc Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/graphics/ToolBar.cc Sun Oct 06 22:25:36 2019 +0200 @@ -38,6 +38,8 @@ #include "ToolBar.h" #include "QtHandlesUtils.h" +#include "../src/gui-preferences.h" + namespace QtHandles { @@ -87,6 +89,8 @@ bar->setFloatable (false); bar->setMovable (false); bar->setVisible (tp.is_visible ()); + bar->setStyleSheet (bar->styleSheet () + octgui_toolbar_style); + m_empty = addEmptyAction (bar);
--- a/libgui/src/gui-preferences.h Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/src/gui-preferences.h Sun Oct 06 22:25:36 2019 +0200 @@ -52,13 +52,13 @@ const gui_pref global_mono_font ("monospace_font", global_font_family); // Compacter Style for some widgets -const QString octgui_toolbar_style ("margin-top: 1px; margin-bottom: 1px;" - "margin-left: 3px; margin-right: 3px;" - "border: 0px;"); -const QString octgui_menubar_style ("margin-top: 0px; margin-bottom: 0px;" - "margin-left: 0px; margin-right: opx;"); -const QString octgui_filterbar_style ("margin-top: 1px; margin-bottom: 1px;" - "margin-left: 3px; margin-right: 3px;"); +const QString octgui_toolbar_style ("QToolBar {spacing-top: 0px; spacing-bottom: 0px; " + "margin-top: 0px; margin-bottom: 0px; " + "padding-top: 0px; padding-bottom: 0px; " + "border-top: 0px; border-bottom: 0px;}"); +const QString octgui_menubar_style ("QMenuBar {spacing-top: 0px; spacing-bottom: 0px;" + "margin-top: 0px; margin-bottom: 0px;" + "padding-top: 0px; padding-bottom: 0px;}"); // Icon size (in preferences: values -1, 0, 1) const QStyle::PixelMetric global_icon_sizes[3] =
--- a/libgui/src/history-dock-widget.cc Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/src/history-dock-widget.cc Sun Oct 06 22:25:36 2019 +0200 @@ -289,9 +289,6 @@ m_filter->setSizePolicy (sizePol); m_filter->completer ()->setCaseSensitivity (Qt::CaseSensitive); - m_filter->setStyleSheet (m_filter->styleSheet () + octgui_filterbar_style); - - QLabel *filter_label = new QLabel (tr ("Filter")); m_filter_checkbox = new QCheckBox (); @@ -313,6 +310,7 @@ hist_layout->addWidget (m_history_list_view); hist_layout->setMargin (2); + hist_layout->setSpacing (0); widget ()->setLayout (hist_layout); // Init state of the filter
--- a/libgui/src/main-window.cc Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/src/main-window.cc Sun Oct 06 22:25:36 2019 +0200 @@ -2631,9 +2631,7 @@ { m_main_tool_bar = addToolBar (tr ("Toolbar")); m_main_tool_bar->setStyleSheet (m_main_tool_bar->styleSheet () - + QString ("margin-top: 1px; margin-bottom: 1px;" - "margin-left: 3px; margin-right: 3px;" - "border: 0px;")); + + octgui_toolbar_style); m_main_tool_bar->setObjectName ("MainToolBar"); m_main_tool_bar->addAction (m_new_script_action);
--- a/libgui/src/octave-dock-widget.cc Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/src/octave-dock-widget.cc Sun Oct 06 22:25:36 2019 +0200 @@ -486,6 +486,7 @@ QToolBar* toolbar = findChild <QToolBar *> (); if (toolbar) toolbar->setStyleSheet (toolbar->styleSheet () + octgui_toolbar_style); + QMenuBar* menubar = findChild <QMenuBar *> (); if (menubar) menubar->setStyleSheet (menubar->styleSheet () + octgui_menubar_style);
--- a/libgui/src/workspace-view.cc Sat Oct 05 14:04:36 2019 -0700 +++ b/libgui/src/workspace-view.cc Sun Oct 06 22:25:36 2019 +0200 @@ -87,14 +87,14 @@ filter_layout->addWidget (filter_label); filter_layout->addWidget (m_filter_checkbox); filter_layout->addWidget (m_filter); - filter_layout->setMargin(0); + filter_layout->setMargin (0); + m_filter_widget->setLayout (filter_layout); - m_filter->setStyleSheet (m_filter->styleSheet () + octgui_filterbar_style); - QVBoxLayout *ws_layout = new QVBoxLayout (); ws_layout->addWidget (m_filter_widget); ws_layout->addWidget (m_view); + ws_layout->setSpacing (0); QSettings *settings = resource_manager::get_settings ();