Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX(theme): Adapt Qt behavior change regarding padding in QMenu #5771

Merged
merged 2 commits into from
Aug 6, 2022
Merged

FIX(theme): Adapt Qt behavior change regarding padding in QMenu #5771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93a405
FIX(theme): Adapt Qt behavior change regarding padding in QMenu
Hartmnt Aug 3, 2022
c975743
CHANGE(ui): Show action icons in menu bar where applicable
Hartmnt Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/mumble/MainWindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<string>Shows a dialog of registered servers, and also allows quick-connect.</string>
</property>
<property name="iconVisibleInMenu">
<bool>false</bool>
<bool>true</bool>
</property>
</action>
<action name="qaServerDisconnect">
Expand Down Expand Up @@ -277,7 +277,7 @@
<string>This will show extended information about the connection to the server.</string>
</property>
<property name="iconVisibleInMenu">
<bool>false</bool>
<bool>true</bool>
</property>
</action>
<action name="qaUserKick">
Expand Down Expand Up @@ -562,7 +562,7 @@
<enum>QAction::PreferencesRole</enum>
</property>
<property name="iconVisibleInMenu">
<bool>false</bool>
<bool>true</bool>
</property>
</action>
<action name="qaFilterToggle">
Expand Down Expand Up @@ -773,6 +773,13 @@ the channel's context menu.</string>
<property name="whatsThis">
<string>This will add the user as a friend, so you can recognize him on this and other servers.</string>
</property>
<property name="icon">
<iconset>
<normaloff>skin:emblems/emblem-favorite.svg</normaloff>skin:emblems/emblem-favorite.svg</iconset>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
</action>
<action name="qaUserFriendRemove">
<property name="text">
Expand Down Expand Up @@ -875,6 +882,13 @@ the channel's context menu.</string>
<property name="toolTip">
<string>Query server for connection information for user</string>
</property>
<property name="icon">
<iconset>
<normaloff>skin:Information_icon.svg</normaloff>skin:Information_icon.svg</iconset>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
</action>
<action name="qaSelfComment">
<property name="icon">
Expand All @@ -888,7 +902,7 @@ the channel's context menu.</string>
<string>Change your own comment</string>
</property>
<property name="iconVisibleInMenu">
<bool>false</bool>
<bool>true</bool>
</property>
</action>
<action name="qaSelfRegister">
Expand Down Expand Up @@ -927,7 +941,7 @@ the channel's context menu.</string>
<string>Recording</string>
</property>
<property name="iconVisibleInMenu">
<bool>false</bool>
<bool>true</bool>
</property>
</action>
<action name="qaShow">
Expand Down
24 changes: 13 additions & 11 deletions themes/Default/Dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,16 @@ QMenu {
QMenu::item {
border: 1px solid transparent;
color: #d8d8d8;
padding: 5px 16px;
padding-left: 25px;
padding: 5px;
padding-right: 16px;
padding-left: 8px;
border-radius: 2px;
}

QMenu::icon {
left: 4px;
}

QMenu::item:selected {
background: #3e4f5e;
border: 1px solid #3e4f5e;
Expand All @@ -217,12 +222,6 @@ QMenu::separator {
height: 1px;
}

QMenu::indicator {
padding-top: 2px;
height: 25px;
width: 25px;
}

QPushButton {
background-color: #444;
border: 1px solid #444;
Expand Down Expand Up @@ -708,8 +707,11 @@ QTreeView::indicator {
}

QMenu::indicator {
padding-top: 2px;
width: 12px;
height: 12px;
left: 6px;
margin-right: 8px;
}

QCheckBox::indicator:checked,
Expand Down Expand Up @@ -1052,15 +1054,15 @@ TalkingUI > * {
background-color: #191919;
}

TalkingUI [selected=false] {
TalkingUI [selected="false"] {
Krzmbrzl marked this conversation as resolved.
Show resolved Hide resolved
background-color: #191919;
}

TalkingUI [selected=false]:hover {
TalkingUI [selected="false"]:hover {
background-color: #333;
}

TalkingUI [selected=true] {
TalkingUI [selected="true"] {
background-color: #3e4f5e;
border: 1px solid #3e4f5e;
}
Expand Down
24 changes: 13 additions & 11 deletions themes/Default/Lite.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,16 @@ QMenu {
QMenu::item {
border: 1px solid transparent;
color: #111;
padding: 5px 16px;
padding-left: 25px;
padding: 5px;
padding-right: 16px;
padding-left: 8px;
border-radius: 2px;
}

QMenu::icon {
left: 4px;
}

QMenu::item:selected {
background: #dcedf5;
border: 1px solid #97b5c6;
Expand All @@ -217,12 +222,6 @@ QMenu::separator {
height: 1px;
}

QMenu::indicator {
padding-top: 2px;
height: 25px;
width: 25px;
}

QPushButton {
background-color: #FFF;
border: 1px solid #C4C4C4;
Expand Down Expand Up @@ -708,8 +707,11 @@ QTreeView::indicator {
}

QMenu::indicator {
padding-top: 2px;
width: 12px;
height: 12px;
left: 6px;
margin-right: 8px;
}

QCheckBox::indicator:checked,
Expand Down Expand Up @@ -1052,15 +1054,15 @@ TalkingUI > * {
background-color: #FFF;
}

TalkingUI [selected=false] {
TalkingUI [selected="false"] {
background-color: #FFF;
}

TalkingUI [selected=false]:hover {
TalkingUI [selected="false"]:hover {
background-color: #eee;
}

TalkingUI [selected=true] {
TalkingUI [selected="true"] {
background-color: #dcedf5;
border: 1px solid #97b5c6;
}
Expand Down
24 changes: 13 additions & 11 deletions themes/Default/source/Imports/Base Theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,17 @@ QMenu::item
{
border:1px solid transparent;
color:$sub-text;
padding:$base-padding + 1 $base-padding * 4;
padding-left:25px;
padding:$base-padding + 1;
padding-right:$base-padding * 4;
padding-left:$base-padding * 2;
border-radius:$base-border-radius;
}

QMenu::icon
{
left:$base-padding;
}

QMenu::item:selected
{
background:$menuitem-hover;
Expand All @@ -240,13 +246,6 @@ QMenu::separator
height:1px;
}

QMenu::indicator
{
padding-top: 2px;
height:25px;
width:25px;
}

QPushButton
{
background-color:$button-bg;
Expand Down Expand Up @@ -809,8 +808,11 @@ QTreeView::indicator,

QMenu::indicator
{
width: 12px;
left: 6px;
padding-top:2px;
width:12px;
height:12px;
left:6px;
margin-right:8px;
}

QCheckBox::indicator:checked,
Expand Down