[gnome-themes-standard] adwaita: Actually use the new hidpi assets

From: Alexander Larsson <alexl src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-themes-standard] adwaita: Actually use the new hidpi assets
Date: Fri, 5 Jul 2013 14:11:48 +0000 (UTC)
commit 41de4d0766064dee61118c8a9c090e6381940a79
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Jul 5 16:11:25 2013 +0200

    adwaita: Actually use the new hidpi assets

 .../gtk-3.0/gnome-applications-dark-overrides.css  |    2 +-
 themes/Adwaita/gtk-3.0/gnome-applications.css      |    2 +-
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |   14 +++++++-------
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   14 +++++++-------
 themes/Adwaita/gtk-3.0/gtk.gresource.xml           |   14 ++++++++++++++
 5 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications-dark-overrides.css 
b/themes/Adwaita/gtk-3.0/gnome-applications-dark-overrides.css
index 7a7e694..1a4c540 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications-dark-overrides.css
@@ -17,5 +17,5 @@ EphyToolbar .location-entry .button:backdrop,
 EphyToolbar .location-entry .button:backdrop:first-child,
 EphyToolbar .location-entry .button:backdrop:hover,
 EphyToolbar .location-entry .button:backdrop:hover:first-child {
-    border-image-source: url("borders/generic-border-backdrop-dark.png");
+    border-image-source: -gtk-scaled 
(url("borders/generic-border-backdrop-dark.png"),url("borders/generic-border-backdrop-dark 2 png"));
 }
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 120b95d..7cf7c01 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -488,7 +488,7 @@ EphyToolbar .location-entry .button:backdrop,
 EphyToolbar .location-entry .button:backdrop:first-child,
 EphyToolbar .location-entry .button:backdrop:hover,
 EphyToolbar .location-entry .button:backdrop:hover:first-child {
-    border-image-source: url("borders/generic-border-backdrop.png");
+    border-image-source: -gtk-scaled 
(url("borders/generic-border-backdrop.png"),url("borders/generic-border-backdrop 2 png"));
     box-shadow: none;
     background-image: none;
     background-color: @theme_unfocused_base_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css 
b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 3c31245..131576b 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -24,7 +24,7 @@ GtkSwitch.trough:active:insensitive {
 }
 
 .trough row {
-    border-image: url("borders/nohl-generic-border-dark.png") 3 / 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/nohl-generic-border-dark.png"),url("borders/nohl-generic-border-dark 2 png")) 3 / 3px stretch;
     border-radius: 3px;
     border-width: 1px;
     border-style: solid;
@@ -67,7 +67,7 @@ GtkSwitch.trough:active {
 /* tooltip elements borders */
 .tooltip .entry,
 .tooltip .button {
-    border-image: url("borders/tooltip-generic-border-dark.svg") 3 / 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/tooltip-generic-border-dark.svg"),url("borders/tooltip-generic-border-dark 2 png")) 3 / 3px 
stretch;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
@@ -75,7 +75,7 @@ GtkSwitch.trough:active {
 
 /* tooltip focused elements borders */
 .tooltip .entry:focus {
-    border-image: url("borders/tooltip-generic-border-focused-dark.svg") 3 / 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/tooltip-generic-border-focused-dark.svg"),url("borders/tooltip-generic-border-focused-dark 2 
png")) 3 / 3px stretch;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
@@ -214,7 +214,7 @@ GtkSwitch.trough:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
 .inline-toolbar.toolbar.vertical .button:backdrop:active {
-    border-image: url("borders/generic-border-backdrop-dark.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/generic-border-backdrop-dark.png"),url("borders/generic-border-backdrop-dark 2 png")) 3 3 4 3 / 
3px 3px 4px 3px stretch;
     border-radius: 3px;
     border-width: 1px 1px 2px 1px;
     border-style: solid;
@@ -222,7 +222,7 @@ GtkSwitch.trough:backdrop,
 }
 
 .trough row:backdrop {
-    border-image: url("borders/nohl-generic-border-backdrop-dark.png") 3 / 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/nohl-generic-border-backdrop-dark.png"),url("borders/nohl-generic-border-backdrop-dark 2 png")) 
3 / 3px stretch;
     border-radius: 3px;
     border-width: 1px;
     border-style: solid;
@@ -241,7 +241,7 @@ GtkSwitch.trough:backdrop,
 .inline-toolbar.toolbar .button:backdrop,
 .inline-toolbar.toolbar .button:backdrop:insensitive,
 .inline-toolbar.toolbar .button:backdrop:active {
-    border-image: url("borders/primary-toolbar-generic-border-backdrop-dark.png") 4 / 4px stretch;
+    border-image: -gtk-scaled 
(url("borders/primary-toolbar-generic-border-backdrop-dark.png"),url("borders/primary-toolbar-generic-border-backdrop-dark
 2 png")) 4 / 4px stretch;
     border-radius: 3px;
     border-width: 2px;
     border-style: solid;
@@ -251,7 +251,7 @@ GtkSwitch.trough:backdrop,
 /* pushed colored buttons borders */
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
-    border-image: url("borders/generic-border-transparent-dark.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/generic-border-transparent-dark.png"),url("borders/generic-border-transparent-dark 2 png")) 3 3 
4 3 / 3px 3px 4px 3px stretch;
     border-radius: 4px;
     border-width: 0px 0px 1px 0px;
     border-style: solid;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 5f5f7af..76eb194 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -24,7 +24,7 @@ GtkSwitch.trough:active:insensitive {
 }
 
 .trough row {
-    border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch;
+    border-image: -gtk-scaled (url("borders/nohl-generic-border.png"),url("borders/nohl-generic-border 2 
png")) 3 / 3px stretch;
     border-radius: 3px;
     border-width: 1px;
     border-style: solid;
@@ -67,7 +67,7 @@ GtkSwitch.trough:active {
 /* tooltip elements borders */
 .tooltip .entry,
 .tooltip .button {
-    border-image: url("borders/tooltip-generic-border.svg") 3 / 3px stretch;
+    border-image: -gtk-scaled (url("borders/tooltip-generic-border.svg"),url("borders/tooltip-generic-border 
2 png")) 3 / 3px stretch;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
@@ -75,7 +75,7 @@ GtkSwitch.trough:active {
 
 /* tooltip focused elements borders */
 .tooltip .entry:focus {
-    border-image: url("borders/tooltip-generic-border-focused.svg") 3 / 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/tooltip-generic-border-focused.svg"),url("borders/tooltip-generic-border-focused 2 png")) 3 / 
3px stretch;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
@@ -213,7 +213,7 @@ GtkSwitch.trough:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
 .inline-toolbar.toolbar.vertical .button:backdrop:active {
-    border-image: url("borders/generic-border-backdrop.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/generic-border-backdrop.png"),url("borders/generic-border-backdrop 2 png")) 3 3 4 3 / 3px 3px 
4px 3px stretch;
     border-radius: 3px;
     border-width: 1px 1px 2px 1px;
     border-style: solid;
@@ -221,7 +221,7 @@ GtkSwitch.trough:backdrop,
 }
 
 .trough row:backdrop {
-    border-image: url("borders/nohl-generic-border-backdrop.png") 3 / 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/nohl-generic-border-backdrop.png"),url("borders/nohl-generic-border-backdrop 2 png")) 3 / 3px 
stretch;
     border-radius: 3px;
     border-width: 1px;
     border-style: solid;
@@ -240,7 +240,7 @@ GtkSwitch.trough:backdrop,
 .inline-toolbar.toolbar .button:backdrop,
 .inline-toolbar.toolbar .button:backdrop:insensitive,
 .inline-toolbar.toolbar .button:backdrop:active {
-    border-image: url("borders/primary-toolbar-generic-border-backdrop.png") 4 / 4px stretch;
+    border-image: -gtk-scaled 
(url("borders/primary-toolbar-generic-border-backdrop.png"),url("borders/primary-toolbar-generic-border-backdrop
 2 png")) 4 / 4px stretch;
     border-radius: 3px;
     border-width: 2px;
     border-style: solid;
@@ -250,7 +250,7 @@ GtkSwitch.trough:backdrop,
 /* pushed colored buttons borders */
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
-    border-image: url("borders/generic-border-transparent.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    border-image: -gtk-scaled 
(url("borders/generic-border-transparent.png"),url("borders/generic-border-transparent 2 png")) 3 3 4 3 / 3px 
3px 4px 3px stretch;
     border-radius: 4px;
     border-width: 0px 0px 1px 0px;
     border-style: solid;
diff --git a/themes/Adwaita/gtk-3.0/gtk.gresource.xml b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
index a04bf10..8fe8752 100644
--- a/themes/Adwaita/gtk-3.0/gtk.gresource.xml
+++ b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
@@ -264,7 +264,9 @@
     <file preprocess="to-pixdata">borders/button-border.png</file>
     <file preprocess="to-pixdata">borders/button-border 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border-backdrop-dark.png</file>
+    <file preprocess="to-pixdata">borders/generic-border-backdrop-dark 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border-backdrop.png</file>
+    <file preprocess="to-pixdata">borders/generic-border-backdrop 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border-dark.png</file>
     <file preprocess="to-pixdata">borders/generic-border-dark 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border-focused-dark.png</file>
@@ -272,15 +274,21 @@
     <file preprocess="to-pixdata">borders/generic-border-focused.png</file>
     <file preprocess="to-pixdata">borders/generic-border-focused 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border-transparent-dark.png</file>
+    <file preprocess="to-pixdata">borders/generic-border-transparent-dark 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border-transparent.png</file>
+    <file preprocess="to-pixdata">borders/generic-border-transparent 2 png</file>
     <file preprocess="to-pixdata">borders/generic-border.png</file>
     <file preprocess="to-pixdata">borders/generic-border 2 png</file>
     <file preprocess="to-pixdata">borders/nohl-generic-border-backdrop-dark.png</file>
+    <file preprocess="to-pixdata">borders/nohl-generic-border-backdrop-dark 2 png</file>
     <file preprocess="to-pixdata">borders/nohl-generic-border-backdrop.png</file>
+    <file preprocess="to-pixdata">borders/nohl-generic-border-backdrop 2 png</file>
     <file preprocess="to-pixdata">borders/nohl-generic-border-dark.png</file>
+    <file preprocess="to-pixdata">borders/nohl-generic-border-dark 2 png</file>
     <file preprocess="to-pixdata">borders/nohl-generic-border-transparent-dark.png</file>
     <file preprocess="to-pixdata">borders/nohl-generic-border-transparent.png</file>
     <file preprocess="to-pixdata">borders/nohl-generic-border.png</file>
+    <file preprocess="to-pixdata">borders/nohl-generic-border 2 png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-button-border-dark.png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-button-border-dark 2 png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-button-border-default-dark.png</file>
@@ -290,7 +298,9 @@
     <file preprocess="to-pixdata">borders/primary-toolbar-button-border.png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-button-border 2 png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-backdrop-dark.png</file>
+    <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-backdrop-dark 2 png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-backdrop.png</file>
+    <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-backdrop 2 png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-dark.png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-dark 2 png</file>
     <file preprocess="to-pixdata">borders/primary-toolbar-generic-border-focused-dark.png</file>
@@ -301,9 +311,13 @@
     <file preprocess="to-pixdata">borders/primary-toolbar-generic-border 2 png</file>
     <file preprocess="to-pixdata">borders/selection-toolbar-suggested-button-border.svg</file>
     <file preprocess="to-pixdata">borders/tooltip-generic-border-dark.svg</file>
+    <file preprocess="to-pixdata">borders/tooltip-generic-border-dark 2 png</file>
     <file preprocess="to-pixdata">borders/tooltip-generic-border-focused-dark.svg</file>
+    <file preprocess="to-pixdata">borders/tooltip-generic-border-focused-dark 2 png</file>
     <file preprocess="to-pixdata">borders/tooltip-generic-border-focused.svg</file>
+    <file preprocess="to-pixdata">borders/tooltip-generic-border-focused 2 png</file>
     <file preprocess="to-pixdata">borders/tooltip-generic-border.svg</file>
+    <file preprocess="to-pixdata">borders/tooltip-generic-border 2 png</file>
     <file>gnome-applications.css</file>
     <file>gnome-applications-dark-overrides.css</file>
     <file>gtk-widgets.css</file>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]