aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2016-04-26 13:21:01 -0400
committerKen Moore <moorekou@gmail.com>2016-04-26 13:21:01 -0400
commit640a39fa47a8f4a3155a9f4f0d2e85b1c0b28532 (patch)
treecc66cb4e0f072217a801cf912ddf8133d97cad2a /src-qt5/core
parentAdjust the FreeBSD appstore shortcut to use the new "appcafe.desktop" entry (... (diff)
parentChange the default size so that there is no weird window resizing. (diff)
downloadlumina-640a39fa47a8f4a3155a9f4f0d2e85b1c0b28532.tar.gz
lumina-640a39fa47a8f4a3155a9f4f0d2e85b1c0b28532.tar.bz2
lumina-640a39fa47a8f4a3155a9f4f0d2e85b1c0b28532.zip
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'src-qt5/core')
-rw-r--r--src-qt5/core/libLumina/themes/Lumina-default.qss.template8
-rw-r--r--src-qt5/core/lumina-desktop/SettingsMenu.cpp3
2 files changed, 9 insertions, 2 deletions
diff --git a/src-qt5/core/libLumina/themes/Lumina-default.qss.template b/src-qt5/core/libLumina/themes/Lumina-default.qss.template
index a40a3d48..9f03d4ae 100644
--- a/src-qt5/core/libLumina/themes/Lumina-default.qss.template
+++ b/src-qt5/core/libLumina/themes/Lumina-default.qss.template
@@ -68,10 +68,16 @@ QMenuBar::item:disabled{
}
QMenu::item{
+ border: 2px solid #808080;
+}
+
+QMenu::item{
background: transparent;
border: 1px solid transparent;
color: %%TEXTCOLOR%%;
- padding: 2px 30px 2px 20px;
+ padding: 4px 30px 4px 20px;
+ margin-left: 3px;
+ margin-right: 3px;
}
/* TAB WIDGETS */
diff --git a/src-qt5/core/lumina-desktop/SettingsMenu.cpp b/src-qt5/core/lumina-desktop/SettingsMenu.cpp
index 540538b5..10ada2cf 100644
--- a/src-qt5/core/lumina-desktop/SettingsMenu.cpp
+++ b/src-qt5/core/lumina-desktop/SettingsMenu.cpp
@@ -10,6 +10,7 @@
#include <LuminaOS.h>
SettingsMenu::SettingsMenu() : QMenu(){
+ this->setObjectName("SettingsMenu");
connect(this, SIGNAL(triggered(QAction*)), this, SLOT(runApp(QAction*)) );
connect(QApplication::instance(), SIGNAL(LocaleChanged()), this, SLOT(UpdateMenu()) );
connect(QApplication::instance(), SIGNAL(IconThemeChanged()), this, SLOT(UpdateMenu()) );
@@ -17,7 +18,7 @@ SettingsMenu::SettingsMenu() : QMenu(){
}
SettingsMenu::~SettingsMenu(){
-
+
}
void SettingsMenu::UpdateMenu(){
bgstack15