From ce9228cf4bac4e00004358eb27a21e7814463184 Mon Sep 17 00:00:00 2001 From: manongjohn Date: Sat, 3 Apr 2021 21:21:25 -0400 Subject: [PATCH] Disable menu icons --- stuff/config/qss/Dark/Dark.qss | 2 +- stuff/config/qss/Darker/Darker.qss | 2 +- stuff/config/qss/Light/Light.qss | 2 +- stuff/config/qss/Medium/Medium.qss | 2 +- stuff/config/qss/Medium/less/layouts/mainwindow.less | 2 +- stuff/config/qss/Neutral/Neutral.qss | 2 +- toonz/sources/toonz/main.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qss index 5e8e68dc..7c411df6 100644 --- a/stuff/config/qss/Dark/Dark.qss +++ b/stuff/config/qss/Dark/Dark.qss @@ -309,7 +309,7 @@ QMenu { } QMenu::item { border: 0; - padding: 3 28 3 40; + padding: 3 28; } QMenu::item:selected { background-color: #5385a6; diff --git a/stuff/config/qss/Darker/Darker.qss b/stuff/config/qss/Darker/Darker.qss index d0bec6dc..f53cb3dd 100644 --- a/stuff/config/qss/Darker/Darker.qss +++ b/stuff/config/qss/Darker/Darker.qss @@ -309,7 +309,7 @@ QMenu { } QMenu::item { border: 0; - padding: 3 28 3 40; + padding: 3 28; } QMenu::item:selected { background-color: #5385a6; diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qss index 326bc919..a5a6f2fd 100644 --- a/stuff/config/qss/Light/Light.qss +++ b/stuff/config/qss/Light/Light.qss @@ -309,7 +309,7 @@ QMenu { } QMenu::item { border: 0; - padding: 3 28 3 40; + padding: 3 28; } QMenu::item:selected { background-color: #a0c1dd; diff --git a/stuff/config/qss/Medium/Medium.qss b/stuff/config/qss/Medium/Medium.qss index 5beb1a04..c0312d09 100644 --- a/stuff/config/qss/Medium/Medium.qss +++ b/stuff/config/qss/Medium/Medium.qss @@ -309,7 +309,7 @@ QMenu { } QMenu::item { border: 0; - padding: 3 28 3 40; + padding: 3 28; } QMenu::item:selected { background-color: #5385a6; diff --git a/stuff/config/qss/Medium/less/layouts/mainwindow.less b/stuff/config/qss/Medium/less/layouts/mainwindow.less index ca481597..8ef309f9 100644 --- a/stuff/config/qss/Medium/less/layouts/mainwindow.less +++ b/stuff/config/qss/Medium/less/layouts/mainwindow.less @@ -139,7 +139,7 @@ QMenu { padding: 2 0; &::item { border: 0; - padding: 3 28 3 40; + padding: 3 28; &:selected { background-color: @menu-item-bg-color-selected; color: @menu-item-text-color-selected; diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qss index ad947d63..57b135de 100644 --- a/stuff/config/qss/Neutral/Neutral.qss +++ b/stuff/config/qss/Neutral/Neutral.qss @@ -309,7 +309,7 @@ QMenu { } QMenu::item { border: 0; - padding: 3 28 3 40; + padding: 3 28; } QMenu::item:selected { background-color: #8FA0B2; diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index cf9e0691..8f422168 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -436,7 +436,7 @@ int main(int argc, char *argv[]) { // qDebug() << "All icon theme search paths:" << QIcon::themeSearchPaths(); // Set show icons in menus flag (use iconVisibleInMenu to disable selectively) - QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus, false); + QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus, true); TEnv::setApplicationFileName(argv[0]);