diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index d08cacf50..4760cb2e2 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/blackcore/setupreader.cpp @@ -65,6 +65,8 @@ namespace BlackCore } else { + this->m_bootstrapUrls.clear(); // clean up previous values + // web URL if (!this->m_bootsrapUrlFileValue.isEmpty()) { diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index 4d8b03dda..2d5241c9d 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -45,7 +45,7 @@ namespace BlackGui this->ps_setDockArea(Qt::TopDockWidgetArea); this->iniFileBasedSettings(); - this->connectAllWidgets(); + this->connectTopLevelChanged(); this->setFeaturesForDockableWidgets(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable); this->tabifyAllWidgets(); @@ -522,7 +522,7 @@ namespace BlackGui return areaIndex >= 0 && areaIndex < this->m_dockWidgetInfoAreas.size(); } - void CInfoArea::connectAllWidgets() + void CInfoArea::connectTopLevelChanged() { for (CDockWidgetInfoArea *dw : this->m_dockWidgetInfoAreas) { diff --git a/src/blackgui/infoarea.h b/src/blackgui/infoarea.h index 2f5c5206c..a132da7e0 100644 --- a/src/blackgui/infoarea.h +++ b/src/blackgui/infoarea.h @@ -189,7 +189,7 @@ namespace BlackGui void setTabPixmaps(); //! Connect all widgets - void connectAllWidgets(); + void connectTopLevelChanged(); //! Margins for the floating widgets void setMarginsWhenFloating(int left, int top, int right, int bottom); diff --git a/src/blackgui/qss/stdwidget.qss b/src/blackgui/qss/stdwidget.qss index 4c3d4be9e..3b320d12e 100644 --- a/src/blackgui/qss/stdwidget.qss +++ b/src/blackgui/qss/stdwidget.qss @@ -333,13 +333,13 @@ QColorDialog { QMenuBar { background-image: url(:/textures/icons/textures/texture-outer.jpg); background-color: darkslategray; - padding: 0px 0px 0px 10px; + padding: 5px 0px 0px 10px; margin: 0px 0px 20px 0px; /* removes overlapping bar in frameless mode, why bottom margin helps here, no idea, bug? */ } QMenuBar::item { - spacing: 3px; /* spacing between menu bar items */ - padding: 1px 4px; + spacing: 5px; /* spacing between menu bar items */ + padding: 3px 3px; background: transparent; border-radius: 4px; } @@ -356,7 +356,11 @@ QMenu { border: 2px solid darkslategray; /* reserve space for selection border */ background: lightgray; color: black; - padding: 2px; + padding: 3px; +} + +QMenu::item { + padding: 4px 25px 4px 20px; } QScrollArea {