windowcontrols: show all buttons in *-all extras (Fixes #266) (#267)

tkashkin · Sep 11, 2024 · ae77155 · ae77155
1 parent 72142e8
commit ae77155
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 116 deletions.
diff --git a/adwaita/css/dialogs/pagedsettings/dialog.css b/adwaita/css/dialogs/pagedsettings/dialog.css
@@ -142,8 +142,8 @@ body.DesktopUI div._2sssIwe0duyIrFvat2oXzH::before
 	content: "";
 	-webkit-app-region: drag;
 	position: absolute;
-	left: var(--adw-windowcontrols-close-margin-left);
-	right: var(--adw-windowcontrols-close-margin-right);
+	left: var(--adw-windowcontrols-margin-left);
+	right: var(--adw-windowcontrols-margin-right);
 	top: 0;
 	height: 46px;
 }
@@ -182,7 +182,7 @@ body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div[class*="pagedsett
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.RTicBCbDcEGkjsbmWzA8C > div._3qEgQJqeb0zyM12KXq64Or,
 body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div._2kwFFHckg8jvnwJfg9-la8 > div._2rjVTGz8aLvqOdz5v2gq5C
 {
-	padding: 12px calc(var(--adw-windowcontrols-close-margin-left) + 6px) !important;
+	padding: 12px calc(var(--adw-windowcontrols-margin-left) + 6px) !important;
 }
 
 body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.DialogContent_InnerWidth > div.DialogBody,

diff --git a/adwaita/css/dialogs/settings.css b/adwaita/css/dialogs/settings.css
@@ -699,8 +699,8 @@ body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div._19z_50-qWZWxcgXfWNtSWb
 	top: 0 !important;
 	height: 46px !important;
 	box-sizing: border-box !important;
-	width: calc(600px - 2 * var(--adw-windowcontrols-close-margin-right)) !important;
-	margin-left: var(--adw-windowcontrols-close-margin-right) !important;
+	width: calc(600px - 2 * var(--adw-windowcontrols-margin-right)) !important;
+	margin-left: var(--adw-windowcontrols-margin-right) !important;
 	z-index: 2 !important;
 }
 

diff --git a/adwaita/css/main/headerbar/headerbar.css b/adwaita/css/main/headerbar/headerbar.css
@@ -308,12 +308,6 @@ body.DesktopUI div._1_yS5UP7el0aN4vntx3dx div._14fYfDS-pwIUwGfqr48EM > div._2ohO
 	color: rgba(var(--adw-headerbar-fg-rgb), var(--adw-disabled-opacity)) !important;
 }
 
-body.DesktopUI div[class*="bottombar_BottomBarContainer_"] div[class*="bottombar_BottomBar_"] div.window_resize_grip,
-body.DesktopUI div._1_yS5UP7el0aN4vntx3dx div._3vCzSrrXZzZjVJFZNg9SGu div.window_resize_grip
-{
-	opacity: 0 !important;
-}
-
 /* Headerbar - hide empty divs in menus */
 body.DesktopUI div[class*="steamdesktop_TopBar_"] div[class*="supernav_SuperNav_"] div:not([class]),
 body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div._2D64jIEK7wpUR_NlObDW76 div:not([class]),

diff --git a/adwaita/css/widgets/dialogs.css b/adwaita/css/widgets/dialogs.css
@@ -1,4 +1,5 @@
-body.DesktopUI div#popup_target::after
+body.DesktopUI div#popup_target::after,
+html.client_chat_frame div#popup_target::after
 {
 	content: "";
 	position: absolute;
@@ -13,12 +14,21 @@ body.DesktopUI div#popup_target::after
 }
 
 body.DesktopUI .ModalPosition_TopBar,
-
-html.client_chat_frame .ModalPosition_TopBar
+body.DesktopUI .singleWindowFocusBar,
+body.DesktopUI .title-area .title-area-highlight,
+html.client_chat_frame .ModalPosition_TopBar,
+html.client_chat_frame .singleWindowFocusBar,
+html.client_chat_frame .title-area .title-area-highlight
 {
 	display: none !important;
 }
 
+body.DesktopUI div.window_resize_grip,
+html.client_chat_frame div.window_resize_grip
+{
+	opacity: 0 !important;
+}
+
 /* Web dialogs */
 body.DesktopUI.ModalDialogBody .PopupFullWindow .title-area
 {
@@ -27,7 +37,6 @@ body.DesktopUI.ModalDialogBody .PopupFullWindow .title-area
 }
 
 body.DesktopUI.ModalDialogBody .PopupFullWindow div[class*="htmlpopupdialog_HTMLPopupDialog_"].DialogContent,
-
 body.DesktopUI.ModalDialogBody .PopupFullWindow div.oHNgIzAySfCEOayCBwsg5.DialogContent
 {
 	background: rgb(var(--adw-headerbar-bg-rgb)) !important;

diff --git a/adwaita/extras/windowcontrols/left-all.css b/adwaita/extras/windowcontrols/left-all.css
@@ -23,56 +23,12 @@ body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3
 	order: -1 !important;
 }
 
-/* Friendslist */
-html.client_chat_frame .currentUserContainer .AvatarAndUser
-{
-	padding-left: var(--adw-windowcontrols-close-margin-left) !important;
-}
-
-html.client_chat_frame .multiChatDialog .title-bar-actions.window-controls
-{
-	position: fixed !important;
-	left: 0 !important;
-	right: auto !important;
-}
-
-/* Overlay */
-.ModalDialogPopup:not(.steamdesktopoverlay_NoTitlebarSpacer_20pOd) div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj,
-.ModalDialogPopup:not(._20pOdcUEtPsMIA8YXWGQim) div.C9tvuqqEXGcrkcAtHrQ_R div._2O7tjQ9VWj5nhZ0y-pdpX2
-{
-	height: 48px !important;
-}
-
-.ModalDialogPopup div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.window-controls,
-.ModalDialogPopup div.C9tvuqqEXGcrkcAtHrQ_R div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.window-controls
-{
-	margin-right: 0 !important;
-}
-
-.ModalDialogPopup div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.extra-actions,
-.ModalDialogPopup div.C9tvuqqEXGcrkcAtHrQ_R div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.extra-actions
-{
-	margin-right: 12px !important;
-}
-
-.ModalDialogPopup:not(.steamdesktopoverlay_NoTitlebarSpacer_20pOd) div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.extra-actions
-.ModalDialogPopup:not(._20pOdcUEtPsMIA8YXWGQim) div.C9tvuqqEXGcrkcAtHrQ_R div._2O7tjQ9VWj5nhZ0y .title-bar-actions.extra-actions
-{
-	order: -98 !important;
-}
-
-.ModalDialogPopup.steamdesktopoverlay_NoTitlebarSpacer_20pOd div.pagedsettings_Hidden_1uk_4 + .DialogContentTransition div.pagedsettings_HidePageListButton_3i4Ep,
-.ModalDialogPopup._20pOdcUEtPsMIA8YXWGQim div._1uk_4ujCnZKFDlDXM_LWdF + .DialogContentTransition div._3i4EpiSDpxQHVFExxUa1Zp
-{
-	margin-left: 30px !important;
-}
-
-body.DesktopUI div.steamdesktop_TopBar_3Z7VQ div.steamdesktop_WindowControls_qP17e .title-area-icon.minimizeButton,
-body.DesktopUI div.steamdesktop_TopBar_3Z7VQ div.steamdesktop_WindowControls_qP17e .title-area-icon.maximizeButton,
-body.DesktopUI div.steamdesktop_TopBar_3Z7VQ div.steamdesktop_WindowControls_qP17e .title-area-icon.restoreButton,
-body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3 .title-area-icon.minimizeButton,
-body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3 .title-area-icon.maximizeButton,
-body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3 .title-area-icon.restoreButton
+body.DesktopUI .title-bar-actions .title-area-icon.minimizeButton,
+body.DesktopUI .title-bar-actions .title-area-icon.maximizeButton,
+body.DesktopUI .title-bar-actions .title-area-icon.restoreButton,
+html.client_chat_frame .title-bar-actions .title-area-icon.minimizeButton,
+html.client_chat_frame .title-bar-actions .title-area-icon.maximizeButton,
+html.client_chat_frame .title-bar-actions .title-area-icon.restoreButton
 {
 	display: block !important;
 }

diff --git a/adwaita/extras/windowcontrols/left.css b/adwaita/extras/windowcontrols/left.css
@@ -22,47 +22,3 @@ body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3
 	margin-left: 10px !important;
 	order: -1 !important;
 }
-
-/* Friendslist */
-html.client_chat_frame .currentUserContainer .AvatarAndUser
-{
-	padding-left: var(--adw-windowcontrols-close-margin-left) !important;
-}
-
-html.client_chat_frame .multiChatDialog .title-bar-actions.window-controls
-{
-	position: fixed !important;
-	left: 0px !important;
-	right: auto !important;
-}
-
-/* Overlay */
-.ModalDialogPopup:not(.steamdesktopoverlay_NoTitlebarSpacer_20pOd) div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj,
-.ModalDialogPopup:not(._20pOdcUEtPsMIA8YXWGQim) div.C9tvuqqEXGcrkcAtHrQ_R div._2O7tjQ9VWj5nhZ0y-pdpX2
-{
-	height: 48px !important;
-}
-
-.ModalDialogPopup div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.window-controls,
-.ModalDialogPopup div.C9tvuqqEXGcrkcAtHrQ_R div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.window-controls
-{
-	margin-right: 0 !important;
-}
-
-.ModalDialogPopup div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.extra-actions,
-.ModalDialogPopup div.C9tvuqqEXGcrkcAtHrQ_R div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.extra-actions
-{
-	margin-right: 12px !important;
-}
-
-.ModalDialogPopup:not(.steamdesktopoverlay_NoTitlebarSpacer_20pOd) div.steamdesktopoverlay_OverlayPopup_C9tvu div.steamdesktopoverlay_WindowControls_2O7tj .title-bar-actions.extra-actions
-.ModalDialogPopup:not(._20pOdcUEtPsMIA8YXWGQim) div.C9tvuqqEXGcrkcAtHrQ_R div._2O7tjQ9VWj5nhZ0y .title-bar-actions.extra-actions
-{
-	order: -98 !important;
-}
-
-.ModalDialogPopup.steamdesktopoverlay_NoTitlebarSpacer_20pOd div.pagedsettings_Hidden_1uk_4 + .DialogContentTransition div.pagedsettings_HidePageListButton_3i4Ep,
-.ModalDialogPopup._20pOdcUEtPsMIA8YXWGQim div._1uk_4ujCnZKFDlDXM_LWdF + .DialogContentTransition div._3i4EpiSDpxQHVFExxUa1Zp
-{
-	margin-left: 30px !important;
-}
diff --git a/adwaita/extras/windowcontrols/right-all.css b/adwaita/extras/windowcontrols/right-all.css
@@ -8,12 +8,12 @@
 	--adw-windowcontrols-close-margin-right: 40px;
 }
 
-body.DesktopUI div.steamdesktop_TopBar_3Z7VQ div.steamdesktop_WindowControls_qP17e .title-area-icon.minimizeButton,
-body.DesktopUI div.steamdesktop_TopBar_3Z7VQ div.steamdesktop_WindowControls_qP17e .title-area-icon.maximizeButton,
-body.DesktopUI div.steamdesktop_TopBar_3Z7VQ div.steamdesktop_WindowControls_qP17e .title-area-icon.restoreButton,
-body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3 .title-area-icon.minimizeButton,
-body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3 .title-area-icon.maximizeButton,
-body.DesktopUI div._3Z7VQ1IMk4E3HsHvrkLNgo div.qP17eBPXkfezFfexZ4hC3 .title-area-icon.restoreButton
+body.DesktopUI .title-bar-actions .title-area-icon.minimizeButton,
+body.DesktopUI .title-bar-actions .title-area-icon.maximizeButton,
+body.DesktopUI .title-bar-actions .title-area-icon.restoreButton,
+html.client_chat_frame .title-bar-actions .title-area-icon.minimizeButton,
+html.client_chat_frame .title-bar-actions .title-area-icon.maximizeButton,
+html.client_chat_frame .title-bar-actions .title-area-icon.restoreButton
 {
 	display: block !important;
 }
diff --git a/theme.json b/theme.json
@@ -1,7 +1,7 @@
 {
     "name": "Adwaita for Steam",
     "author": "tk",
-    "version": "v2.5",
+    "version": "v2.6",
     "manifest_version": 8,
     "description": "A skin to make Steam look more like a native GNOME app",
     "target": "Desktop",