From a3c76494a4e5ee94b2968c01e8d55f189ba84502 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 17 Sep 2014 22:29:08 -0700 Subject: gtk2: integrate improvements from atw1990@gmail.com Improvements all around, especially in entries and spinbuttons. https://bugzilla.gnome.org/show_bug.cgi?id=735825 --- .../gtk-2.0/Arrows/arrow-down-small-insens.png | Bin .../gtk-2.0/Arrows/arrow-down-small-prelight.png | Bin themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png | Bin .../gtk-2.0/Arrows/arrow-up-small-insens.png | Bin .../gtk-2.0/Arrows/arrow-up-small-prelight.png | Bin themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png | Bin .../gtk-2.0/Buttons/button-default-nohilight.png | Bin 448 -> 433 bytes themes/Adwaita/gtk-2.0/Buttons/button-default.png | Bin 484 -> 474 bytes .../Buttons/button-insensitive-nohilight.png | Bin 371 -> 349 bytes .../Adwaita/gtk-2.0/Buttons/button-insensitive.png | Bin 405 -> 387 bytes .../gtk-2.0/Buttons/button-prelight-nohilight.png | Bin 439 -> 421 bytes themes/Adwaita/gtk-2.0/Buttons/button-prelight.png | Bin 478 -> 463 bytes .../gtk-2.0/Buttons/button-pressed-nohilight.png | Bin 408 -> 387 bytes themes/Adwaita/gtk-2.0/Buttons/button-pressed.png | Bin 450 -> 429 bytes .../gtk-2.0/Entry/combo-entry-border-active-bg.png | Bin 274 -> 253 bytes .../Entry/combo-entry-border-active-rtl-bg.png | Bin 295 -> 266 bytes .../gtk-2.0/Entry/combo-entry-border-bg.png | Bin 334 -> 360 bytes .../Entry/combo-entry-border-disabled-bg.png | Bin 275 -> 263 bytes .../Entry/combo-entry-border-disabled-rtl-bg.png | Bin 295 -> 257 bytes .../gtk-2.0/Entry/combo-entry-border-rtl-bg.png | Bin 373 -> 375 bytes .../Entry/combo-entry-button-active-rtl.png | Bin 359 -> 343 bytes .../gtk-2.0/Entry/combo-entry-button-active.png | Bin 373 -> 356 bytes .../Entry/combo-entry-button-disabled-rtl.png | Bin 317 -> 297 bytes .../gtk-2.0/Entry/combo-entry-button-disabled.png | Bin 331 -> 311 bytes .../gtk-2.0/Entry/combo-entry-button-rtl.png | Bin 353 -> 338 bytes .../Adwaita/gtk-2.0/Entry/combo-entry-button.png | Bin 368 -> 347 bytes .../Entry/entry-border-active-bg-solid-spin.png | Bin 0 -> 305 bytes .../gtk-2.0/Entry/entry-border-active-bg-solid.png | Bin 402 -> 404 bytes .../gtk-2.0/Entry/entry-border-active-bg.png | Bin 355 -> 358 bytes .../gtk-2.0/Entry/entry-border-bg-solid-spin.png | Bin 0 -> 303 bytes .../gtk-2.0/Entry/entry-border-bg-solid.png | Bin 406 -> 405 bytes themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png | Bin 427 -> 413 bytes .../gtk-2.0/Entry/entry-border-disabled-bg.png | Bin 353 -> 352 bytes .../Entry/notebook-entry-border-active-bg.png | Bin 0 -> 357 bytes .../gtk-2.0/Entry/notebook-entry-border-bg.png | Bin 0 -> 402 bytes .../Entry/notebook-entry-border-disabled-bg.png | Bin 0 -> 324 bytes themes/Adwaita/gtk-2.0/Lines/line-h.png | Bin themes/Adwaita/gtk-2.0/Makefile.am | 5 + themes/Adwaita/gtk-2.0/Others/focus.png | Bin themes/Adwaita/gtk-2.0/Others/null.png | Bin .../gtk-2.0/Spin/down-background-disable-rtl.png | Bin 264 -> 235 bytes .../gtk-2.0/Spin/down-background-disable.png | Bin 260 -> 226 bytes .../Adwaita/gtk-2.0/Spin/down-background-rtl.png | Bin 277 -> 247 bytes themes/Adwaita/gtk-2.0/Spin/down-background.png | Bin 265 -> 219 bytes .../gtk-2.0/Spin/up-background-disable-rtl.png | Bin 242 -> 204 bytes .../Adwaita/gtk-2.0/Spin/up-background-disable.png | Bin 257 -> 211 bytes themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png | Bin 269 -> 240 bytes themes/Adwaita/gtk-2.0/Spin/up-background.png | Bin 293 -> 253 bytes themes/Adwaita/gtk-2.0/gtkrc | 454 ++++++++++----------- 49 files changed, 229 insertions(+), 230 deletions(-) mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-insens.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Arrows/arrow-down-small-prelight.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-insens.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Arrows/arrow-up-small-prelight.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png create mode 100644 themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid-spin.png create mode 100644 themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid-spin.png create mode 100644 themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-active-bg.png create mode 100644 themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-bg.png create mode 100644 themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-disabled-bg.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Lines/line-h.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Others/focus.png mode change 100755 => 100644 themes/Adwaita/gtk-2.0/Others/null.png 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png b/themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png old mode 100755 new mode 100644 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 c3068336..4b96a1d4 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 1150b055..d18e8d0c 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 88b3b1b8..ad0511b4 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 bef18a0d..5d46887f 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 0e2a559e..6640aba8 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 a1e7cd4f..1a1f0334 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 1493cad1..26ab76b9 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 c7d0d51a..6f85e346 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-bg.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png index 3ec5cfdb..7550d47b 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png index e20312ba..1b684ebb 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png index 5717fab1..43fc88ea 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png index b5fc666b..b9794b5b 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png index aef4a29b..86a42b6a 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-disabled-rtl-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png index 0df28c54..edf9a8e4 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png and b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.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 0b7d9f3a..20bae171 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 4737ad1c..1ee98b18 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 b317926b..64063631 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 5c8d5a45..f4a21007 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 213387fa..f321969c 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 6671400b..04a52432 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-border-active-bg-solid-spin.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid-spin.png new file mode 100644 index 00000000..3416830c Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid-spin.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png index 85839b54..7ea47c3d 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png index c9abe1eb..5f365e06 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid-spin.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid-spin.png new file mode 100644 index 00000000..5e6e2e08 Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid-spin.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png index 4fd41cdb..cafa6484 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png index 3a492dac..c92b0efb 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png index e16b8dd2..f6f94a06 100644 Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png and b/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-active-bg.png b/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-active-bg.png new file mode 100644 index 00000000..5a7e2e7e Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-active-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-bg.png b/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-bg.png new file mode 100644 index 00000000..9b589712 Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-disabled-bg.png b/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-disabled-bg.png new file mode 100644 index 00000000..5ad49f65 Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/notebook-entry-border-disabled-bg.png differ diff --git a/themes/Adwaita/gtk-2.0/Lines/line-h.png b/themes/Adwaita/gtk-2.0/Lines/line-h.png old mode 100755 new mode 100644 diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am index ede12372..6bf04436 100644 --- a/themes/Adwaita/gtk-2.0/Makefile.am +++ b/themes/Adwaita/gtk-2.0/Makefile.am @@ -82,6 +82,11 @@ asset_data = \ Entry/entry-border-notebook.png \ Entry/entry-border-active-notebook.png \ Entry/entry-border-disabled-notebook.png \ + Entry/entry-border-bg-solid-spin.png \ + Entry/entry-border-active-bg-solid-spin.png \ + Entry/notebook-entry-border-active-bg.png \ + Entry/notebook-entry-border-bg.png \ + Entry/notebook-entry-border-disabled-bg.png \ Expanders/minus.png \ Expanders/plus.png \ Handles/handle-h.png \ diff --git a/themes/Adwaita/gtk-2.0/Others/focus.png b/themes/Adwaita/gtk-2.0/Others/focus.png old mode 100755 new mode 100644 diff --git a/themes/Adwaita/gtk-2.0/Others/null.png b/themes/Adwaita/gtk-2.0/Others/null.png old mode 100755 new mode 100644 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 59c29f14..e6d80e38 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 2fbc3cb1..07fc6611 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 8c4e254d..9e66b76a 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 b8eb29aa..6d2c6580 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 a5b62f6e..f45c7c8e 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 f0d44522..65025211 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 3a441fe4..5ce7fffb 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 67907ed1..59025d29 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 2462866b..1ba20820 100755 --- a/themes/Adwaita/gtk-2.0/gtkrc +++ b/themes/Adwaita/gtk-2.0/gtkrc @@ -1,6 +1,6 @@ # Bridge | ScionicSpectre -gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#000000\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434" +gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#2E3436\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434" gtk-auto-mnemonics = 1 gtk-primary-button-warps-slider = 1 @@ -47,7 +47,7 @@ style "default" GtkVScale::slider_length = 16 GtkVScale::slider_width = 16 GtkHScale::slider_length = 16 - GtkHScale::slider_width = 17 + GtkHScale::slider_width = 16 GtkStatusbar::shadow_type = GTK_SHADOW_NONE GtkSpinButton::shadow_type = GTK_SHADOW_NONE @@ -523,7 +523,9 @@ style "default" expander_style = SEMI_COLLAPSED file = "Expanders/plus.png" } - + + # Others + image { function = RESIZE_GRIP @@ -584,7 +586,7 @@ style "scrollbar" orientation = VERTICAL } -# Sliders + # Sliders image { @@ -727,7 +729,7 @@ style "menu_framed_box" style "menu_item" { xthickness = 2 - ythickness = 4 + ythickness = 3 # HACK: Gtk doesn't actually read this value # while rendering the menu items, but Libreoffice @@ -928,7 +930,7 @@ style "menubar_item" style "button" { - xthickness = 4 + xthickness = 3 ythickness = 3 engine "pixmap" @@ -970,8 +972,8 @@ style "button" style "button_nohilight" { - xthickness = 4 - ythickness = 3 + xthickness = 3 + ythickness = 4 engine "pixmap" { @@ -1054,30 +1056,36 @@ style "entry" file = "Entry/entry-border-active-bg.png" border = { 4, 4, 4, 4 } stretch = TRUE - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "Entry/entry-border-fill.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - image - { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "Entry/entry-border-fill.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } } } style "notebook_entry" { + xthickness = 3 + ythickness = 4 + + base[NORMAL] = @base_color + base[INSENSITIVE] = @insensitive_bg_color + engine "pixmap" { image @@ -1086,7 +1094,7 @@ style "notebook_entry" detail = "entry" state = NORMAL shadow = IN - file = "Entry/entry-border-notebook.png" + file = "Entry/notebook-entry-border-bg.png" border = { 4, 4, 4, 4 } stretch = TRUE } @@ -1096,7 +1104,7 @@ style "notebook_entry" detail = "entry" state = INSENSITIVE shadow = IN - file = "Entry/entry-border-disabled-notebook.png" + file = "Entry/notebook-entry-border-disabled-bg.png" border = { 4, 4, 4, 4 } stretch = TRUE } @@ -1104,12 +1112,30 @@ style "notebook_entry" { function = SHADOW detail = "entry" - state = ACTIVE - file = "Entry/entry-border-active-notebook.png" + state = ACTIVE + file = "Entry/notebook-entry-border-active-bg.png" border = { 4, 4, 4, 4 } stretch = TRUE - } - } + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + file = "Others/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + } + } } style "notebook_tab_label" @@ -1119,7 +1145,7 @@ style "notebook_tab_label" style "combobox_entry" { - xthickness = 3 + xthickness = 2 ythickness = 4 engine "pixmap" @@ -1132,7 +1158,7 @@ style "combobox_entry" state = NORMAL shadow = IN file = "Entry/combo-entry-border-bg.png" - border = { 4, 4, 5, 4 } + border = { 4, 4, 4, 4 } stretch = TRUE direction = LTR } @@ -1194,39 +1220,45 @@ style "combobox_entry" } } -style "notebook_combobox_entry" +style "combobox_entry_button" { + fg[ACTIVE] = @text_color + engine "pixmap" { # LTR version image { - function = SHADOW - detail = "entry" + function = BOX state = NORMAL - shadow = IN - file = "Entry/combo-entry-border-notebook.png" + file = "Entry/combo-entry-button.png" border = { 4, 4, 5, 4 } stretch = TRUE direction = LTR } image { - function = SHADOW - detail = "entry" + function = BOX + state = PRELIGHT + file = "Entry/combo-entry-button.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = LTR + } + image + { + function = BOX state = INSENSITIVE - shadow = IN - file = "Entry/combo-entry-border-disabled-notebook.png" + file = "Entry/combo-entry-button-disabled.png" border = { 4, 4, 5, 4 } stretch = TRUE direction = LTR } image { - function = SHADOW - detail = "entry" + function = BOX state = ACTIVE - file = "Entry/combo-entry-border-active-notebook.png" + file = "Entry/combo-entry-button-active.png" border = { 4, 4, 5, 4 } stretch = TRUE direction = LTR @@ -1235,32 +1267,36 @@ style "notebook_combobox_entry" # RTL version image { - function = SHADOW - detail = "entry" + function = BOX state = NORMAL - shadow = IN - file = "Entry/combo-entry-border-rtl-notebook.png" + file = "Entry/combo-entry-button-rtl.png" border = { 4, 4, 5, 4 } stretch = TRUE direction = RTL } image { - function = SHADOW - detail = "entry" + function = BOX + state = PRELIGHT + file = "Entry/combo-entry-button-rtl.png" + border = { 4, 4, 5, 4 } + stretch = TRUE + direction = RTL + } + image + { + function = BOX state = INSENSITIVE - shadow = IN - file = "Entry/combo-entry-border-disabled-rtl-notebook.png" + file = "Entry/combo-entry-button-disabled-rtl.png" border = { 4, 4, 5, 4 } stretch = TRUE direction = RTL } image { - function = SHADOW - detail = "entry" + function = BOX state = ACTIVE - file = "Entry/combo-entry-border-active-rtl-notebook.png" + file = "Entry/combo-entry-button-active-rtl.png" border = { 4, 4, 5, 4 } stretch = TRUE direction = RTL @@ -1268,205 +1304,119 @@ style "notebook_combobox_entry" } } -style "combobox_entry_button" +style "spinbutton" { - fg[ACTIVE] = @text_color + bg[NORMAL] = @bg_color + + xthickness = 4 + ythickness = 4 engine "pixmap" { + image + { + function = ARROW + } - # LTR version + # Spin-Up LTR image { function = BOX - state = NORMAL - file = "Entry/combo-entry-button.png" - border = { 4, 4, 5, 4 } + state = NORMAL + detail = "spinbutton_up" + file = "Spin/up-background.png" + border = { 1, 4, 5, 0 } stretch = TRUE - direction = LTR + overlay_file = "Arrows/arrow-up-small.png" + overlay_stretch = FALSE + direction = LTR } image { function = BOX - state = PRELIGHT - file = "Entry/combo-entry-button.png" - border = { 4, 4, 5, 4 } + state = PRELIGHT + detail = "spinbutton_up" + file = "Spin/up-background.png" + border = { 1, 4, 5, 0 } stretch = TRUE - direction = LTR + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = LTR } image { function = BOX - state = INSENSITIVE - file = "Entry/combo-entry-button-disabled.png" - border = { 4, 4, 5, 4 } + state = INSENSITIVE + detail = "spinbutton_up" + file = "Spin/up-background-disable.png" + border = { 1, 4, 5, 0 } stretch = TRUE - direction = LTR + overlay_file = "Arrows/arrow-up-small-insens.png" + overlay_stretch = FALSE + direction = LTR } - image - { + image + { function = BOX - state = ACTIVE - file = "Entry/combo-entry-button-active.png" - border = { 4, 4, 5, 4 } + state = ACTIVE + detail = "spinbutton_up" + file = "Spin/up-background.png" + border = { 1, 4, 5, 0 } stretch = TRUE - direction = LTR - } + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = LTR + } - # RTL version + # Spin-Up RTL image { function = BOX - state = NORMAL - file = "Entry/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } + state = NORMAL + detail = "spinbutton_up" + file = "Spin/up-background-rtl.png" + border = { 4, 1, 5, 0 } stretch = TRUE - direction = RTL + overlay_file = "Arrows/arrow-up-small.png" + overlay_stretch = FALSE + direction = RTL } image { function = BOX - state = PRELIGHT - file = "Entry/combo-entry-button-rtl.png" - border = { 4, 4, 5, 4 } + state = PRELIGHT + detail = "spinbutton_up" + file = "Spin/up-background-rtl.png" + border = { 4, 1, 5, 0 } stretch = TRUE - direction = RTL + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = RTL } image { function = BOX - state = INSENSITIVE - file = "Entry/combo-entry-button-disabled-rtl.png" - border = { 4, 4, 5, 4 } + state = INSENSITIVE + detail = "spinbutton_up" + file = "Spin/up-background-disable-rtl.png" + border = { 4, 1, 5, 0 } stretch = TRUE - direction = RTL + overlay_file = "Arrows/arrow-up-small-insens.png" + overlay_stretch = FALSE + direction = RTL } image { function = BOX - state = ACTIVE - file = "Entry/combo-entry-button-active-rtl.png" - border = { 4, 4, 5, 4 } + state = ACTIVE + detail = "spinbutton_up" + file = "Spin/up-background-rtl.png" + border = { 4, 1, 5, 0 } stretch = TRUE - direction = RTL - } - - } -} - -style "spinbutton" -{ - bg[NORMAL] = @bg_color - - xthickness = 3 - ythickness = 4 - - engine "pixmap" - { - image - { - function = ARROW - } - - # Spin-Up LTR - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - file = "Spin/up-background.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - file = "Spin/up-background.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - file = "Spin/up-background-disable.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-insens.png" - overlay_stretch = FALSE - direction = LTR - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - file = "Spin/up-background.png" - border = { 1, 4, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = LTR - } - - # Spin-Up RTL - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - file = "Spin/up-background-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - file = "Spin/up-background-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - file = "Spin/up-background-disable-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-insens.png" - overlay_stretch = FALSE - direction = RTL - } - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - file = "Spin/up-background-rtl.png" - border = { 4, 1, 5, 0 } - stretch = TRUE - overlay_file = "Arrows/arrow-up-small-prelight.png" - overlay_stretch = FALSE - direction = RTL - } + overlay_file = "Arrows/arrow-up-small-prelight.png" + overlay_stretch = FALSE + direction = RTL + } # Spin-Down LTR image @@ -1700,19 +1650,54 @@ style "libreoffice_entry" } } -style "standalone_entry" +style "libreoffice_spinbutton_entry" { engine "pixmap" { - image - { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - file = "Entry/entry-border-fill-plain.png" - stretch = TRUE - border = { 0, 0, 0, 0 } + image + { + function = SHADOW + detail = "entry" + state = NORMAL + shadow = IN + file = "Entry/entry-border-bg-solid-spin.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = SHADOW + detail = "entry" + state = ACTIVE + file = "Entry/entry-border-active-bg-solid-spin.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + overlay_file = "Entry/entry-border-fill-solid.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + overlay_file = "Entry/entry-border-fill-solid.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } } +} + +style "standalone_entry" +{ + engine "pixmap" + { image { function = FLAT_BOX @@ -1740,7 +1725,16 @@ style "standalone_entry" file = "Entry/entry-border-active-bg-solid.png" border = { 4, 4, 4, 4 } stretch = TRUE - } + } + image + { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + file = "Entry/entry-border-fill-plain.png" + stretch = TRUE + border = { 0, 0, 0, 0 } + } } } @@ -1901,7 +1895,7 @@ style "handlebox" } } -style "combobox_separator" +style "button_separator" { xthickness = 0 ythickness = 0 @@ -2336,7 +2330,7 @@ widget_class "*.*" style "menubar_item" widget_class "**" style "checkbutton" widget_class "*" style "combobox" widget_class "**" style "combobox_button" -widget_class "**" style "combobox_separator" +widget_class "**" style "button_separator" widget_class "*HandleBox" style "handlebox" widget_class "***" style "treeview_header" widget_class "**" style "inline_toolbar" @@ -2351,7 +2345,7 @@ widget_class "***" style "notebook widget_class "**" style "notebook_entry" widget_class "***" style "entry" -widget_class "***" style "notebook_combobox_entry" +#widget_class "***" style "notebook_combobox_entry" widget_class "****" style "combobox_entry" # We also need to avoid changing fg color for the inactive notebook tab labels @@ -2386,6 +2380,6 @@ widget "*swt-toolbar-flat" style "null" class "GtkWindow" style "toplevel_hack" widget "*openoffice-toplevel*" style "ooo_stepper_hack" widget "*openoffice-toplevel*GtkEntry" style "libreoffice_entry" -widget "*openoffice-toplevel*GtkSpinButton" style "libreoffice_entry" +widget "*openoffice-toplevel*GtkSpinButton" style "libreoffice_spinbutton_entry" widget "*libreoffice-toplevel*GtkEntry" style "libreoffice_entry" -widget "*libreoffice-toplevel*GtkSpinButton" style "libreoffice_entry" +widget "*libreoffice-toplevel*GtkSpinButton" style "libreoffice_spinbutton_entry" -- cgit v1.2.3