Merge pull request #281 from tkashkin/windowcontrols

tkashkin · Nov 10, 2024 · fb698b3 · fb698b3
2 parents f7f37f7 + 39fc4a9
commit fb698b3
Show file tree

Hide file tree

Showing 19 changed files with 583 additions and 259 deletions.
diff --git a/README.md b/README.md
@@ -115,14 +115,17 @@ cd Adwaita-for-Steam
 
 #### Arguments
 
-| Argument       | Short | Required Values                    | Description                                        |
-|----------------|-------|------------------------------------|----------------------------------------------------|
-| --color-theme  | -c    | [Colortheme](/adwaita/colorthemes) | Change color theme                                 |
-| --custom-css   |       |                                    | Enable [custom css](/custom)                       |
-| --extras       | -e    | [Extra](adwaita/extras)            | Enable one or multiple theme extras                |
-| --list-options | -l    |                                    | List available themes and extras                   |
-| --target       | -t    | normal / flatpak / [custom dir]    | Choose target location for install (default: both) |
-| --uninstall    | -u    |                                    | Uninstall theme                                    |
+| Argument                | Short | Required Values                                       | Description                                        |
+|-------------------------|-------|-------------------------------------------------------|----------------------------------------------------|
+| --help                  | -h    |                                                       | Show help message                                  |
+| --list-options          | -l    |                                                       | List available themes and extras                   |
+| --color-theme           | -c    | [Colortheme](/adwaita/colorthemes)                    | Change color theme                                 |
+| --windowcontrols-theme  |       | auto / adwaita / windows / macos                      | Change window control buttons style                |
+| --windowcontrols-layout |       | auto / gnome / pantheon / windows / macos / \[custom] | Change window control buttons position and order   |
+| --custom-css            |       |                                                       | Enable [custom css](/custom)                       |
+| --extras                | -e    | [Extra](adwaita/extras)                               | Enable one or multiple theme extras                |
+| --target                | -t    | normal / flatpak / \[custom dir]                      | Choose target location for install (default: both) |
+| --uninstall             | -u    |                                                       | Uninstall theme                                    |
 
 #### Example Usage
 

diff --git a/adwaita/css/_root/variables.css b/adwaita/css/_root/variables.css
@@ -4,14 +4,6 @@
 {
 	--adw-base-transition-curve: cubic-bezier(0.25, 0.46, 0.45, 0.94);
 
-	/* Window controls button margin */
-	--adw-windowcontrols-margin-left: 0px;
-	--adw-windowcontrols-margin-right: 40px;
-
-	/* Window controls button margin for windows with close button only */
-	--adw-windowcontrols-close-margin-left: 0px;
-	--adw-windowcontrols-close-margin-right: 40px;
-
 	--adw-gameicon-radius: 4px;
 	--adw-gameicon-uninstalled-filter: grayscale(100%) opacity(50%);
 }
diff --git a/adwaita/css/chat/chat.css b/adwaita/css/chat/chat.css
@@ -118,7 +118,7 @@ html.client_chat_frame
 		{
 			position: absolute !important;
 			top: 6px !important;
-			left: 6px !important;
+			left: calc(var(--adw-windowcontrols-margin-left) + 6px) !important;
 		}
 
 		svg

diff --git a/adwaita/css/chat/messages.css b/adwaita/css/chat/messages.css
@@ -14,7 +14,7 @@ html.client_chat_frame
 
 			div.chatTabSetContainer
 			{
-				padding: 6px calc(var(--adw-windowcontrols-margin-right) + 6px) 6px calc(var(--adw-windowcontrols-margin-left) + 46px) !important;
+				padding: 6px var(--adw-windowcontrols-margin-right) 6px calc(var(--adw-windowcontrols-margin-left) + 40px) !important;
 				margin: 0 !important;
 				height: 34px !important;
 
@@ -281,6 +281,28 @@ html.client_chat_frame
 									}
 								}
 							}
+
+							div._2ve8VIOIUS5rjAzmJvjVS-
+							{
+								position: absolute !important;
+								left: 0 !important;
+								right: 0 !important;
+								width: auto !important;
+								height: 2px !important;
+								top: unset !important;
+								bottom: 0 !important;
+								pointer-events: none !important;
+								background: none !important;
+
+								div.jMumuBBbjOf_v5JU9RpmZ
+								{
+									position: unset !important;
+									width: 100px !important;
+									height: 2px !important;
+									margin: auto !important;
+									background: rgb(var(--adw-accent-rgb)) !important;
+								}
+							}
 						}
 					}
 				}

diff --git a/adwaita/css/chat/sidebar.css b/adwaita/css/chat/sidebar.css
@@ -63,9 +63,16 @@ html.client_chat_frame
 					display: grid !important;
 					grid-template-columns: 1fr !important;
 					align-items: center !important;
-					padding: 12px !important;
+					padding: 12px calc(var(--adw-windowcontrols-margin-right) + 80px) 12px calc(var(--adw-windowcontrols-margin-left) + 80px) !important;
 					margin: 0 !important;
 					background: inherit !important;
+					-webkit-mask-image: linear-gradient(to right,
+						rgba(0, 0, 0, 0) calc(var(--adw-windowcontrols-margin-left) + 80px),
+						rgba(0, 0, 0, 1) calc(var(--adw-windowcontrols-margin-left) + 86px),
+						rgba(0, 0, 0, 1) calc(100% - var(--adw-windowcontrols-margin-right) - 86px),
+						rgba(0, 0, 0, 0) calc(100% - var(--adw-windowcontrols-margin-right) - 80px),
+						rgba(0, 0, 0, 0)
+					) !important;
 					color: inherit !important;
 					font-family: var(--adw-text-font) !important;
 					font-size: var(--adw-text-header-size) !important;
@@ -316,14 +323,15 @@ html.client_chat_frame
 					bottom: 4px !important;
 					right: 4px !important;
 					background: rgb(var(--adw-accent-bg-rgb)) !important;
+					border-radius: var(--adw-button-pill-radius) !important;
 					color: rgb(var(--adw-accent-fg-rgb)) !important;
 					transform: none !important;
 					font-family: var(--adw-text-font) !important;
 					font-size: 10px !important;
 					line-height: 10px !important;
-					font-weight: 800 !important;
+					font-weight: 500 !important;
 					min-width: 10px !important;
-					letter-spacing: normal;
+					letter-spacing: normal !important;
 					padding: 1px !important;
 				}
 			}
@@ -586,7 +594,9 @@ html.client_chat_frame
 					}
 				}
 
-				div.playerNameQuickAccessContainer, div.clanName
+				div.playerNameQuickAccessContainer,
+				div.clanName,
+				div.ChatUnreadMessageIndicator
 				{
 					display: none !important;
 				}
@@ -665,7 +675,7 @@ html.client_chat_frame
 		div.listContentContainer
 		{
 			display: flex !important;
-            flex-direction: column !important;
+			flex-direction: column !important;
 			padding: 0 !important;
 			overflow: visible !important;
 			overflow-x: clip !important;
@@ -684,7 +694,12 @@ html.client_chat_frame
 				}
 			}
 
-			div.groupName, div.friendCategoryContainer, div.gameGroup div.friendsContainer div.friend, div.ChatRoomListGroupItem, div.friendInviteContainer
+			div.groupName,
+			div.friendCategoryContainer,
+			div.gameGroup div.friendsContainer div.friend,
+			div.ChatRoomListGroupItem,
+			div.friendInviteContainer,
+			div.unreadFriend
 			{
 				padding: 0 6px !important;
 				margin: 0 calc(6px - var(--adw-scrollbar-size)) 2px 6px !important;
@@ -768,22 +783,6 @@ html.client_chat_frame
 				height: fit-content !important;
 				margin: 0 !important;
 				padding: 0 !important;
-
-				img.groupIcon
-				{
-					width: 20px !important;
-					height: 20px !important;
-					padding: 0 !important;
-					margin: 0 !important;
-					position: absolute !important;
-					right: 5px !important;
-					top: 2px !important;
-					border-radius: var(--adw-gameicon-radius) !important;
-					border: 1px rgba(var(--adw-user-ingame-rgb), var(--adw-thin-border-opacity)) solid !important;
-					overflow: hidden !important;
-					box-shadow: none !important;
-					transform: none !important;
-				}
 			}
 
 			div.SortByRecent
@@ -800,6 +799,42 @@ html.client_chat_frame
 				cursor: default !important;
 			}
 
+			img.groupIcon, img.gameIcon
+			{
+				width: 20px !important;
+				height: 20px !important;
+				padding: 0 !important;
+				margin: 0 !important;
+				position: absolute !important;
+				right: 5px !important;
+				top: 2px !important;
+				border-radius: var(--adw-gameicon-radius) !important;
+				border: 1px rgba(var(--adw-user-ingame-rgb), var(--adw-thin-border-opacity)) solid !important;
+				overflow: hidden !important;
+				box-shadow: none !important;
+				transform: none !important;
+			}
+
+			div.FriendMessageCount
+			{
+				position: unset !important;
+				right: 0 !important;
+				margin: 0 !important;
+				background: rgb(var(--adw-accent-bg-rgb)) !important;
+				border-radius: var(--adw-button-pill-radius) !important;
+				color: rgb(var(--adw-accent-fg-rgb)) !important;
+				box-shadow: none !important;
+				transform: none !important;
+				font-family: var(--adw-text-font) !important;
+				font-size: 14px !important;
+				line-height: 14px !important;
+				font-weight: 500 !important;
+				min-width: 14px !important;
+				height: 14px !important;
+				letter-spacing: normal !important;
+				padding: 2px !important;
+			}
+
 			&:hover div.ExpandPlusMinus, div.SortByRecent:hover
 			{
 				opacity: 1 !important;
@@ -811,6 +846,7 @@ html.client_chat_frame
 				padding: 0 !important;
 				margin: 0 !important;
 				height: 40px !important;
+				align-items: center !important;
 
 				div.nibodjvvrm86uCfnnAn4g
 				{
@@ -1075,7 +1111,7 @@ html.client_chat_frame
 		}
 	}
 
-	div.cancelAddFriends
+	div.cancelAddFriends, div.unreadMessageViolator
 	{
 		display: none !important;
 	}

diff --git a/adwaita/css/dialogs/pagedsettings/rows.css b/adwaita/css/dialogs/pagedsettings/rows.css
@@ -10,11 +10,16 @@ body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.SettingsDialogSubHeader,
 body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.DialogBodyText,
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.DialogBodyText,
 body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.DialogBodyText,
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div._1RCWDLVLFja1TdD1P53BMq,
 
 body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.DialogControlsSectionHeader,
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.DialogControlsSectionHeader,
 body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.DialogControlsSectionHeader,
 
+body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.DialogBody > div:first-child:not([class]),
+body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.DialogBody > div:first-child:not([class]),
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.DialogBody > div:first-child:not([class]),
+
 body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.familysettings_FamilyNameRow_3K8Af,
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div._3K8Afwm4bvd9vSIzAz9siX,
 body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div._3K8Afwm4bvd9vSIzAz9siX,
@@ -213,6 +218,14 @@ body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.DialogControlsSec
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.DialogControlsSection + div.S-_LaQG5eEOM2HWZ-geJI,
 body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.DialogControlsSection + div.eKmEXJCm_lgme24Fp_HWt,
 
+body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.DialogBody > div:first-child:not([class]) + div.gamepaddialog_Field_S-_La,
+body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.DialogBody > div:first-child:not([class]) + div.S-_LaQG5eEOM2HWZ-geJI,
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.DialogBody > div:first-child:not([class]) + div.eKmEXJCm_lgme24Fp_HWt,
+
+body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.SettingsDialogSubHeader + div:not([class]) + div.gamepaddialog_Field_S-_La,
+body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.SettingsDialogSubHeader + div:not([class]) + div.S-_LaQG5eEOM2HWZ-geJI,
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.SettingsDialogSubHeader + div:not([class]) + div.eKmEXJCm_lgme24Fp_HWt,
+
 body.DesktopUI div.appproperties_AppProperties_1FyBL div.appproperties_Title_3zuIC + div.gamepaddialog_Field_S-_La,
 body.DesktopUI div._1FyBL6obxHQ2Z2CsaV2Gbz div._3zuICQ63IRympzZ6qgs-5O + div.S-_LaQG5eEOM2HWZ-geJI,
 body.DesktopUI div._1FyBL6obxHQ2Z2CsaV2Gbz div._3zuICQ63IRympzZ6qgs-5O + div.eKmEXJCm_lgme24Fp_HWt,
@@ -500,7 +513,11 @@ body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.eKmEXJCm_lgme24Fp_HWt._3tB2lyT2Pf
 
 body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.gamepaddialog_Field_S-_La[class*="gamepaddialog_WithDescription_"]:not(:has(div[class*="gamepaddialog_FieldLabel_"])) div[class*="gamepaddialog_FieldDescription_"],
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.S-_LaQG5eEOM2HWZ-geJI._3bMISJvxiSHPx1ol-0Aswn:not(:has(div._3b0U-QDD-uhFpw6xM716fw)) div._2OJfkxlD3X9p8Ygu1vR7Lr,
-body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.eKmEXJCm_lgme24Fp_HWt._3tB2lyT2Pfvfv-jyuVgUOg:not(:has(div._3jMlJm4PQCA8SfNlUR99Fo)) div._1W1to_azoBRG95oNAFpf9Q
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.eKmEXJCm_lgme24Fp_HWt._3tB2lyT2Pfvfv-jyuVgUOg:not(:has(div._3jMlJm4PQCA8SfNlUR99Fo)) div._1W1to_azoBRG95oNAFpf9Q,
+
+body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.SettingsDialogSubHeader + div:not([class]),
+body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.SettingsDialogSubHeader + div:not([class]),
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.SettingsDialogSubHeader + div:not([class])
 {
 	color: rgba(var(--adw-card-fg-rgb), var(--adw-dim-label-opacity)) !important;
 	font-size: var(--adw-text-subtitle-size) !important;
@@ -510,6 +527,13 @@ body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.eKmEXJCm_lgme24Fp_HWt._3tB2lyT2Pf
 	margin: 0 !important;
 }
 
+body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.SettingsDialogSubHeader + div:not([class]),
+body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.SettingsDialogSubHeader + div:not([class]),
+body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.SettingsDialogSubHeader + div:not([class])
+{
+	margin: -8px 0 8px 0 !important;
+}
+
 body.DesktopUI div.pagedsettings_PagedSettingsDialog_3I6h_ div.gamepaddialog_Field_S-_La::after,
 body.DesktopUI div._3I6h_oySuLmmLY9TjIKT9s div.S-_LaQG5eEOM2HWZ-geJI::after,
 body.DesktopUI div._2sssIwe0duyIrFvat2oXzH div.eKmEXJCm_lgme24Fp_HWt::after