[gnome-themes-standard] gtk2: use improved assets for the GTK2 version
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] gtk2: use improved assets for the GTK2 version
- Date: Wed, 12 Sep 2012 18:08:18 +0000 (UTC)
commit 0ce8874d8e877f9e6a3677b22fab0ea15638d454
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Sep 12 13:19:05 2012 -0400
gtk2: use improved assets for the GTK2 version
This commit improves a lot the assets we use to render the GTK2 version
of Adwaita, and makes them more consistent with the GTK3 version.
It also fixes some theming bugs in GIMP, and adds vertical and
horizontal padding to buttons, comboboxes, entries and spinbuttons, so
that they are not tied together as reported e.g. in
https://bugzilla.gnome.org/show_bug.cgi?id=682441
.../gtk-2.0/Arrows/arrow-down-small-insens.png | Bin 0 -> 298 bytes
.../gtk-2.0/Arrows/arrow-down-small-prelight.png | Bin 0 -> 275 bytes
themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png | Bin 0 -> 277 bytes
.../gtk-2.0/Arrows/arrow-up-small-insens.png | Bin 0 -> 270 bytes
.../gtk-2.0/Arrows/arrow-up-small-prelight.png | Bin 0 -> 258 bytes
themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png | Bin 0 -> 257 bytes
.../gtk-2.0/Buttons/button-default-nohilight.png | Bin 391 -> 448 bytes
themes/Adwaita/gtk-2.0/Buttons/button-default.png | Bin 391 -> 484 bytes
.../Buttons/button-insensitive-nohilight.png | Bin 374 -> 371 bytes
.../Adwaita/gtk-2.0/Buttons/button-insensitive.png | Bin 380 -> 405 bytes
.../gtk-2.0/Buttons/button-prelight-nohilight.png | Bin 423 -> 439 bytes
themes/Adwaita/gtk-2.0/Buttons/button-prelight.png | Bin 396 -> 478 bytes
.../gtk-2.0/Buttons/button-pressed-nohilight.png | Bin 368 -> 408 bytes
themes/Adwaita/gtk-2.0/Buttons/button-pressed.png | Bin 335 -> 450 bytes
.../Entry/combo-entry-border-active-rtl.png | Bin 424 -> 356 bytes
.../gtk-2.0/Entry/combo-entry-border-active.png | Bin 411 -> 334 bytes
.../Entry/combo-entry-border-disabled-rtl.png | Bin 297 -> 327 bytes
.../gtk-2.0/Entry/combo-entry-border-disabled.png | Bin 287 -> 312 bytes
.../gtk-2.0/Entry/combo-entry-border-rtl.png | Bin 320 -> 364 bytes
.../Adwaita/gtk-2.0/Entry/combo-entry-border.png | Bin 313 -> 347 bytes
.../Entry/combo-entry-button-active-rtl.png | Bin 283 -> 359 bytes
.../gtk-2.0/Entry/combo-entry-button-active.png | Bin 279 -> 373 bytes
.../Entry/combo-entry-button-disabled-rtl.png | Bin 315 -> 317 bytes
.../gtk-2.0/Entry/combo-entry-button-disabled.png | Bin 327 -> 331 bytes
.../gtk-2.0/Entry/combo-entry-button-rtl.png | Bin 331 -> 353 bytes
.../Adwaita/gtk-2.0/Entry/combo-entry-button.png | Bin 337 -> 368 bytes
themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png | Bin 126 -> 155 bytes
themes/Adwaita/gtk-2.0/Entry/entry-bg.png | Bin 150 -> 162 bytes
.../Adwaita/gtk-2.0/Entry/entry-border-active.png | Bin 532 -> 455 bytes
.../gtk-2.0/Entry/entry-border-disabled.png | Bin 402 -> 405 bytes
themes/Adwaita/gtk-2.0/Entry/entry-border.png | Bin 406 -> 462 bytes
themes/Adwaita/gtk-2.0/Makefile.am | 7 +
themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png | Bin 485 -> 459 bytes
.../Adwaita/gtk-2.0/ProgressBar/progressbar_v.png | Bin 563 -> 430 bytes
.../gtk-2.0/ProgressBar/trough-progressbar.png | Bin 314 -> 450 bytes
.../gtk-2.0/ProgressBar/trough-progressbar_v.png | Bin 0 -> 411 bytes
.../gtk-2.0/Spin/down-background-disable-rtl.png | Bin 255 -> 264 bytes
.../gtk-2.0/Spin/down-background-disable.png | Bin 260 -> 260 bytes
.../Adwaita/gtk-2.0/Spin/down-background-rtl.png | Bin 246 -> 277 bytes
themes/Adwaita/gtk-2.0/Spin/down-background.png | Bin 244 -> 265 bytes
.../gtk-2.0/Spin/up-background-disable-rtl.png | Bin 245 -> 242 bytes
.../Adwaita/gtk-2.0/Spin/up-background-disable.png | Bin 249 -> 257 bytes
themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png | Bin 257 -> 269 bytes
themes/Adwaita/gtk-2.0/Spin/up-background.png | Bin 262 -> 293 bytes
themes/Adwaita/gtk-2.0/gtkrc | 270 +++++++++++++++-----
45 files changed, 208 insertions(+), 69 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png
new file mode 100755
index 0000000..5b5e93c
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png differ
diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png
new file mode 100755
index 0000000..0c8dea7
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png
new file mode 100755
index 0000000..a382bdc
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png differ
diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png
new file mode 100755
index 0000000..b89863c
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png differ
diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png
new file mode 100755
index 0000000..75c45c9
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png
new file mode 100755
index 0000000..fc7ce0b
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png b/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png
index 5e42158..c306833 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png and b/themes/Adwaita/gtk-2.0/Buttons/button-default-nohilight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-default.png b/themes/Adwaita/gtk-2.0/Buttons/button-default.png
index 29e41d8..1150b05 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-default.png and b/themes/Adwaita/gtk-2.0/Buttons/button-default.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png b/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png
index eb636b2..88b3b1b 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png and b/themes/Adwaita/gtk-2.0/Buttons/button-insensitive-nohilight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png b/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png
index 7101c2d..bef18a0 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png and b/themes/Adwaita/gtk-2.0/Buttons/button-insensitive.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png b/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png
index c688993..0e2a559 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png and b/themes/Adwaita/gtk-2.0/Buttons/button-prelight-nohilight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png b/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png
index 4521b9a..a1e7cd4 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png and b/themes/Adwaita/gtk-2.0/Buttons/button-prelight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png b/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png
index 328a241..1493cad 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png and b/themes/Adwaita/gtk-2.0/Buttons/button-pressed-nohilight.png differ
diff --git a/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png b/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png
index 8375f2c..c7d0d51 100644
Binary files a/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png and b/themes/Adwaita/gtk-2.0/Buttons/button-pressed.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl.png
index a789a25..3d6d5ee 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active.png
index 3a0f7cb..0799d29 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl.png
index 9b11816..d87c91d 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled.png
index c104552..e340820 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl.png
index f2e6979..f47004b 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border.png
index a47af57..100ba39 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png
index b544c3d..0b7d9f3 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png
index 1bb73b9..4737ad1 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-active.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png
index 165ee03..b317926 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png
index 5739236..5c8d5a4 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-disabled.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png
index 1dd3d7c..213387f 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png
index d28f895..6671400 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-button.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png b/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png
index 3ad139b..ef20346 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png and b/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-bg.png b/themes/Adwaita/gtk-2.0/Entry/entry-bg.png
index f03ff72..a14defe 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-bg.png and b/themes/Adwaita/gtk-2.0/Entry/entry-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png
index 61eb5b4..7b71ea2 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png
index 307c567..1aa026b 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border.png b/themes/Adwaita/gtk-2.0/Entry/entry-border.png
index 22587b4..e49f4a5 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border.png differ
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 4fc7fa4..332fa52 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -10,11 +10,17 @@ asset_data = \
Arrows/arrow-down.png \
Arrows/arrow-down-insens.png \
Arrows/arrow-down-prelight.png \
+ Arrows/arrow-down-small.png \
+ Arrows/arrow-down-small-insens.png \
+ Arrows/arrow-down-small-prelight.png \
Arrows/arrow-left.png \
Arrows/arrow-right.png \
Arrows/arrow-up.png \
Arrows/arrow-up-insens.png \
Arrows/arrow-up-prelight.png \
+ Arrows/arrow-up-small.png \
+ Arrows/arrow-up-small-insens.png \
+ Arrows/arrow-up-small-prelight.png \
Arrows/menu-arrow.png \
Arrows/menu-arrow-prelight.png \
Buttons/button-default.png \
@@ -67,6 +73,7 @@ asset_data = \
ProgressBar/progressbar.png \
ProgressBar/progressbar_v.png \
ProgressBar/trough-progressbar.png \
+ ProgressBar/trough-progressbar_v.png \
Range/slider-horiz.png \
Range/slider-horiz-prelight.png \
Range/slider-vert.png \
diff --git a/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png b/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png
index b8e54ed..389848d 100644
Binary files a/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png and b/themes/Adwaita/gtk-2.0/ProgressBar/progressbar.png differ
diff --git a/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png b/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png
index 437bf71..fcd82d1 100644
Binary files a/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png and b/themes/Adwaita/gtk-2.0/ProgressBar/progressbar_v.png differ
diff --git a/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png b/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png
index 5fa2dcb..c7d0d51 100644
Binary files a/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png and b/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar.png differ
diff --git a/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png b/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png
new file mode 100644
index 0000000..fe29d73
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/ProgressBar/trough-progressbar_v.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png b/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png
index 37b9fa0..59c29f1 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png and b/themes/Adwaita/gtk-2.0/Spin/down-background-disable-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png b/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png
index 4685082..2fbc3cb 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png and b/themes/Adwaita/gtk-2.0/Spin/down-background-disable.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png b/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png
index cf77957..8c4e254 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png and b/themes/Adwaita/gtk-2.0/Spin/down-background-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/down-background.png b/themes/Adwaita/gtk-2.0/Spin/down-background.png
index 0a0eb97..b8eb29a 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/down-background.png and b/themes/Adwaita/gtk-2.0/Spin/down-background.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png b/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png
index 4ec96cd..a5b62f6 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png and b/themes/Adwaita/gtk-2.0/Spin/up-background-disable-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png b/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png
index 49fb54c..f0d4452 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png and b/themes/Adwaita/gtk-2.0/Spin/up-background-disable.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png b/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png
index 5447f58..3a441fe 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png and b/themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png differ
diff --git a/themes/Adwaita/gtk-2.0/Spin/up-background.png b/themes/Adwaita/gtk-2.0/Spin/up-background.png
index 8858003..67907ed 100644
Binary files a/themes/Adwaita/gtk-2.0/Spin/up-background.png and b/themes/Adwaita/gtk-2.0/Spin/up-background.png differ
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index 5a3780e..f535208 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -26,9 +26,9 @@ style "default"
GtkSeparatorMenuItem::wide-separators = 1
GtkSeparatorMenuItem::separator-height = 1
- GtkButton::child-displacement-y = 1
+ GtkButton::child-displacement-y = 0
GtkButton::default-border = { 0, 0, 0, 0 }
- GtkButton::default-outside_border = { 0, 0, 0, 0 }
+ GtkButton::default-outside_border = { 0, 0, 0, 0 }
GtkEntry::state-hint = 1
@@ -790,7 +790,7 @@ style "menubar_item"
style "button"
{
xthickness = 4
- ythickness = 4
+ ythickness = 3
engine "pixmap"
{
@@ -799,7 +799,7 @@ style "button"
function = BOX
state = NORMAL
file = "Buttons/button-default.png"
- border = {4, 4, 4, 4 }
+ border = { 4, 4, 4, 4 }
stretch = TRUE
}
image
@@ -832,7 +832,7 @@ style "button"
style "button_nohilight"
{
xthickness = 4
- ythickness = 4
+ ythickness = 3
engine "pixmap"
{
@@ -871,12 +871,17 @@ style "button_nohilight"
}
}
+style "checkbutton"
+{
+ fg[ACTIVE] = @text_color
+}
+
style "entry"
{
xthickness = 3
ythickness = 4
- base[ACTIVE] = @base_color
+ base[NORMAL] = @bg_color
engine "pixmap"
{
@@ -887,7 +892,7 @@ style "entry"
state = NORMAL
shadow = IN
file = "Entry/entry-border.png"
- border = { 4, 4, 4, 4 }
+ border = { 3, 3, 4, 4 }
stretch = TRUE
}
image
@@ -897,7 +902,7 @@ style "entry"
state = INSENSITIVE
shadow = IN
file = "Entry/entry-border-disabled.png"
- border = { 4, 4, 4, 4 }
+ border = { 3, 3, 4, 4 }
stretch = TRUE
}
image
@@ -906,7 +911,7 @@ style "entry"
detail = "entry"
state = ACTIVE
file = "Entry/entry-border-active.png"
- border = { 4, 4, 4, 4 }
+ border = { 3, 3, 4, 4 }
stretch = TRUE
}
image
@@ -939,6 +944,23 @@ style "entry"
}
}
+style "notebook_entry"
+{
+ base[NORMAL] = @base_color
+ base[INSENSITIVE] = @base_color
+}
+
+style "notebook_spinbutton"
+{
+ # this also inherits "notebook_entry" above
+ bg[NORMAL] = @base_color
+}
+
+style "notebook_tab_label"
+{
+ fg[ACTIVE] = @text_color
+}
+
style "combobox_entry"
{
xthickness = 3
@@ -954,7 +976,7 @@ style "combobox_entry"
state = NORMAL
shadow = IN
file = "Entry/combo-entry-border.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -965,7 +987,7 @@ style "combobox_entry"
state = INSENSITIVE
shadow = IN
file = "Entry/combo-entry-border-disabled.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -975,7 +997,7 @@ style "combobox_entry"
detail = "entry"
state = ACTIVE
file = "Entry/combo-entry-border-active.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -988,7 +1010,7 @@ style "combobox_entry"
state = NORMAL
shadow = IN
file = "Entry/combo-entry-border-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -999,7 +1021,7 @@ style "combobox_entry"
state = INSENSITIVE
shadow = IN
file = "Entry/combo-entry-border-disabled-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -1009,7 +1031,7 @@ style "combobox_entry"
detail = "entry"
state = ACTIVE
file = "Entry/combo-entry-border-active-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -1029,7 +1051,7 @@ style "combobox_entry_button"
function = BOX
state = NORMAL
file = "Entry/combo-entry-button.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -1038,7 +1060,7 @@ style "combobox_entry_button"
function = BOX
state = PRELIGHT
file = "Entry/combo-entry-button.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -1047,7 +1069,7 @@ style "combobox_entry_button"
function = BOX
state = INSENSITIVE
file = "Entry/combo-entry-button-disabled.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -1056,7 +1078,7 @@ style "combobox_entry_button"
function = BOX
state = ACTIVE
file = "Entry/combo-entry-button-active.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = LTR
}
@@ -1067,7 +1089,7 @@ style "combobox_entry_button"
function = BOX
state = NORMAL
file = "Entry/combo-entry-button-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -1076,7 +1098,7 @@ style "combobox_entry_button"
function = BOX
state = PRELIGHT
file = "Entry/combo-entry-button-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -1085,7 +1107,7 @@ style "combobox_entry_button"
function = BOX
state = INSENSITIVE
file = "Entry/combo-entry-button-disabled-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -1094,7 +1116,7 @@ style "combobox_entry_button"
function = BOX
state = ACTIVE
file = "Entry/combo-entry-button-active-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 4, 5, 4 }
stretch = TRUE
direction = RTL
}
@@ -1102,15 +1124,10 @@ style "combobox_entry_button"
}
}
-style "spinbutton" = "default"
+style "spinbutton"
{
xthickness = 3
ythickness = 4
- GtkWidget::interior_focus = 1
-
- base[NORMAL] = shade(1.05, @bg_color)
- base[ACTIVE] = shade(1.05, @bg_color)
- base[INSENSITIVE] = shade(1.02, @bg_color)
engine "pixmap"
{
@@ -1126,9 +1143,9 @@ style "spinbutton" = "default"
state = NORMAL
detail = "spinbutton_up"
file = "Spin/up-background.png"
- border = { 4, 4, 4, 4 }
+ border = { 1, 4, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up.png"
+ overlay_file = "Arrows/arrow-up-small.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1138,9 +1155,9 @@ style "spinbutton" = "default"
state = PRELIGHT
detail = "spinbutton_up"
file = "Spin/up-background.png"
- border = { 4, 4, 4, 4 }
+ border = { 1, 4, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up-prelight.png"
+ overlay_file = "Arrows/arrow-up-small-prelight.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1150,9 +1167,9 @@ style "spinbutton" = "default"
state = INSENSITIVE
detail = "spinbutton_up"
file = "Spin/up-background-disable.png"
- border = { 4, 4, 4, 4 }
+ border = { 1, 4, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up-insens.png"
+ overlay_file = "Arrows/arrow-up-small-insens.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1162,9 +1179,9 @@ style "spinbutton" = "default"
state = ACTIVE
detail = "spinbutton_up"
file = "Spin/up-background.png"
- border = { 4, 4, 4, 4 }
+ border = { 1, 4, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up-prelight.png"
+ overlay_file = "Arrows/arrow-up-small-prelight.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1176,9 +1193,9 @@ style "spinbutton" = "default"
state = NORMAL
detail = "spinbutton_up"
file = "Spin/up-background-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up.png"
+ overlay_file = "Arrows/arrow-up-small.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1188,9 +1205,9 @@ style "spinbutton" = "default"
state = PRELIGHT
detail = "spinbutton_up"
file = "Spin/up-background-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up-prelight.png"
+ overlay_file = "Arrows/arrow-up-small-prelight.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1200,9 +1217,9 @@ style "spinbutton" = "default"
state = INSENSITIVE
detail = "spinbutton_up"
file = "Spin/up-background-disable-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up-insens.png"
+ overlay_file = "Arrows/arrow-up-small-insens.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1212,9 +1229,9 @@ style "spinbutton" = "default"
state = ACTIVE
detail = "spinbutton_up"
file = "Spin/up-background-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 5, 0 }
stretch = TRUE
- overlay_file = "Arrows/arrow-up-prelight.png"
+ overlay_file = "Arrows/arrow-up-small-prelight.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1226,9 +1243,9 @@ style "spinbutton" = "default"
state = NORMAL
detail = "spinbutton_down"
file = "Spin/down-background.png"
- border = { 4, 4, 4, 4 }
+ border = { 1, 4, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down.png"
+ overlay_file = "Arrows/arrow-down-small.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1238,9 +1255,9 @@ style "spinbutton" = "default"
state = PRELIGHT
detail = "spinbutton_down"
file = "Spin/down-background.png"
- border = { 5, 5, 5, 5 }
+ border = { 1, 4, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down-prelight.png"
+ overlay_file = "Arrows/arrow-down-small-prelight.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1250,9 +1267,9 @@ style "spinbutton" = "default"
state = INSENSITIVE
detail = "spinbutton_down"
file = "Spin/down-background-disable.png"
- border = { 5, 5, 5, 5 }
+ border = { 1, 4, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down-insens.png"
+ overlay_file = "Arrows/arrow-down-small-insens.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1262,9 +1279,9 @@ style "spinbutton" = "default"
state = ACTIVE
detail = "spinbutton_down"
file = "Spin/down-background.png"
- border = { 5, 5, 5, 5 }
+ border = { 1, 4, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down-prelight.png"
+ overlay_file = "Arrows/arrow-down-small-prelight.png"
overlay_stretch = FALSE
direction = LTR
}
@@ -1276,9 +1293,9 @@ style "spinbutton" = "default"
state = NORMAL
detail = "spinbutton_down"
file = "Spin/down-background-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down.png"
+ overlay_file = "Arrows/arrow-down-small.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1288,9 +1305,9 @@ style "spinbutton" = "default"
state = PRELIGHT
detail = "spinbutton_down"
file = "Spin/down-background-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down-prelight.png"
+ overlay_file = "Arrows/arrow-down-small-prelight.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1300,9 +1317,9 @@ style "spinbutton" = "default"
state = INSENSITIVE
detail = "spinbutton_down"
file = "Spin/down-background-disable-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down-insens.png"
+ overlay_file = "Arrows/arrow-down-small-insens.png"
overlay_stretch = FALSE
direction = RTL
}
@@ -1312,15 +1329,106 @@ style "spinbutton" = "default"
state = ACTIVE
detail = "spinbutton_down"
file = "Spin/down-background-rtl.png"
- border = { 4, 4, 4, 4 }
+ border = { 4, 1, 1, 4 }
stretch = TRUE
- overlay_file = "Arrows/arrow-down-prelight.png"
+ overlay_file = "Arrows/arrow-down-small-prelight.png"
overlay_stretch = FALSE
direction = RTL
}
}
}
+style "gimp_spin_scale"
+{
+ bg[NORMAL] = @base_color
+
+ engine "pixmap"
+ {
+ image
+ {
+ function = FLAT_BOX
+ detail = "entry_bg"
+ state = NORMAL
+ }
+ image
+ {
+ function = FLAT_BOX
+ detail = "entry_bg"
+ state = ACTIVE
+ }
+ image
+ {
+ function = FLAT_BOX
+ detail = "entry_bg"
+ state = INSENSITIVE
+ }
+ image
+ {
+ function = BOX
+ state = NORMAL
+ detail = "spinbutton_up"
+ overlay_file = "Arrows/arrow-up-small.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = PRELIGHT
+ detail = "spinbutton_up"
+ overlay_file = "Arrows/arrow-up-small-prelight.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ detail = "spinbutton_up"
+ overlay_file = "Arrows/arrow-up-small-prelight.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = INSENSITIVE
+ detail = "spinbutton_up"
+ overlay_file = "Arrows/arrow-up-small-insens.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = NORMAL
+ detail = "spinbutton_down"
+ overlay_file = "Arrows/arrow-down-small.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = PRELIGHT
+ detail = "spinbutton_down"
+ overlay_file = "Arrows/arrow-down-small-prelight.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = ACTIVE
+ detail = "spinbutton_down"
+ overlay_file = "Arrows/arrow-down-small-prelight.png"
+ overlay_stretch = FALSE
+ }
+ image
+ {
+ function = BOX
+ state = INSENSITIVE
+ detail = "spinbutton_down"
+ overlay_file = "Arrows/arrow-down-small-insens.png"
+ overlay_stretch = FALSE
+ }
+ }
+}
+
style "notebook"
{
@@ -1494,7 +1602,7 @@ style "combobox"
style "combobox_button"
{
xthickness = 2
- ythickness = 3
+ ythickness = 2
}
style "range"
@@ -1606,8 +1714,8 @@ style "range"
style "progressbar"
{
- xthickness = 0
- ythickness = 0
+ xthickness = 1
+ ythickness = 1
engine "pixmap"
{
@@ -1616,8 +1724,9 @@ style "progressbar"
function = BOX
detail = "trough"
file = "ProgressBar/trough-progressbar.png"
- border = { 2, 2, 2, 2 }
+ border = { 4, 4, 4, 4 }
stretch = TRUE
+ orientation = HORIZONTAL
}
image
{
@@ -1625,16 +1734,25 @@ style "progressbar"
detail = "bar"
file = "ProgressBar/progressbar.png"
stretch = TRUE
- border = { 2, 2, 2, 2 }
+ border = { 3, 3, 3, 3 }
orientation = HORIZONTAL
}
image
{
function = BOX
+ detail = "trough"
+ file = "ProgressBar/trough-progressbar_v.png"
+ border = { 4, 4, 4, 4 }
+ stretch = TRUE
+ orientation = VERTICAL
+ }
+ image
+ {
+ function = BOX
detail = "bar"
file = "ProgressBar/progressbar_v.png"
stretch = TRUE
- border = { 2, 2, 2, 2 }
+ border = { 3, 3, 3, 3 }
orientation = VERTICAL
}
}
@@ -1807,10 +1925,11 @@ widget_class "*<GtkMenuBar>*" style "menubar"
widget_class "*<GtkMenu>*" style "menu"
widget_class "*<GtkMenuItem>*" style "menu_item"
widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item"
-widget_class "*<GtkComboBox>" style "combobox"
+widget_class "*<GtkCheckButton>*" style "checkbutton"
+widget_class "*<GtkComboBox>" style "combobox"
widget_class "*<GtkComboBox>*<GtkButton>" style "combobox_button"
widget_class "*<GtkComboBox>*<GtkSeparator>" style "combobox_separator"
-widget_class "*HandleBox" style "handlebox"
+widget_class "*HandleBox" style "handlebox"
widget_class "*<GtkTreeView>*<GtkButton>*" style "treeview_header"
widget_class "*<GtkFileChooserDefault>*<GtkToolbar>" style "inline_toolbar"
widget_class "*<GtkFileChooserDefault>*<GtkToolbar>*<GtkButton>" style "button_nohilight"
@@ -1819,6 +1938,19 @@ widget_class "*<GtkComboBoxEntry>*<GtkButton>" style "combobox_entry_button"
widget_class "*<GtkInfoBar>*<GtkButton>" style "button_nohilight"
widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>" style "notebook_viewport"
+# Entries in notebooks draw with notebook's base color, but not if there's
+# something else in the middle that draws gray again
+widget_class "*<GtkNotebook>*<GtkEntry>" style "notebook_entry"
+widget_class "*<GtkNotebook>*<GtkSpinButton>" style "notebook_spinbutton"
+widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkEntry>" style "entry"
+
+# We also need to avoid changing fg color for the inactive notebook tab labels
+widget_class "*<GtkNotebook>.<GtkLabel>" style "notebook_tab_label"
+
+# GIMP
+# Disable gradients completely for GimpSpinScale
+class "GimpSpinScale" style "gimp_spin_scale"
+
# Chrome/Chromium
class "ChromeGtkFrame" style "chrome-gtk-frame"
widget_class "*Chrom*Button*" style "button"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
