diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover.png b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover.png index 7c4efa768b52c77a4072533802b5d10255649d86..9518d717a5ac6512c5af1b7d359ac2859e8b9d12 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover.png and b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover@2.png b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover@2.png index 7a71e2c61cc2f356af5be4d6432bb94ed5b4c1fa..cb735d60f42e8d12966f2f9c12a8218d725c7102 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover@2.png and b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal-hover@2.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal.png b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal.png index f6eba72038ab3cd390f320209195b8e423e13a17..9518d717a5ac6512c5af1b7d359ac2859e8b9d12 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal.png and b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal@2.png b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal@2.png index 0f70e4d21d332b9c01e6d762123d242b93108eef..cb735d60f42e8d12966f2f9c12a8218d725c7102 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-horizontal@2.png and b/Breeze-dark-gtk/assets/scrollbar-slider-horizontal@2.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover.png b/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover.png index 644f19befab5e8b2d4e086bc769204b53b13b9a9..ac9d768eecde7e09e98c9a65b850cf88dc0c43a9 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover.png and b/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover@2.png b/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover@2.png index 68ee30f6328733965f92458012b3b0b8c7128166..37dcff9c93ba71b125a88953098a8cee1b1841d3 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover@2.png and b/Breeze-dark-gtk/assets/scrollbar-slider-vertical-hover@2.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-vertical.png b/Breeze-dark-gtk/assets/scrollbar-slider-vertical.png index 9a0e6071f8391f4cf0f9058f5d968617e1b3087a..ac9d768eecde7e09e98c9a65b850cf88dc0c43a9 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-vertical.png and b/Breeze-dark-gtk/assets/scrollbar-slider-vertical.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-slider-vertical@2.png b/Breeze-dark-gtk/assets/scrollbar-slider-vertical@2.png index 7a71675be8d892229ad1562752ce9a7eb48f3f58..37dcff9c93ba71b125a88953098a8cee1b1841d3 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-slider-vertical@2.png and b/Breeze-dark-gtk/assets/scrollbar-slider-vertical@2.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-trough-horizontal.png b/Breeze-dark-gtk/assets/scrollbar-trough-horizontal.png index 966089589d439eb7adff92819b33f9133ba82d6d..ceb5613e36cb10f389cdc201f83a85c20acebfef 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-trough-horizontal.png and b/Breeze-dark-gtk/assets/scrollbar-trough-horizontal.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-trough-horizontal@2.png b/Breeze-dark-gtk/assets/scrollbar-trough-horizontal@2.png index d323b79c0d93dc44c1a754d82dd61b5703916bc6..f9fed4a38790021e0beb747bc62b61eb8383dc0b 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-trough-horizontal@2.png and b/Breeze-dark-gtk/assets/scrollbar-trough-horizontal@2.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-trough-vertical.png b/Breeze-dark-gtk/assets/scrollbar-trough-vertical.png index 51c4384dd33f3af6ee890caa4319404fc99743cc..c1778392393cfe66483d27d3a90fb42b54457b27 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-trough-vertical.png and b/Breeze-dark-gtk/assets/scrollbar-trough-vertical.png differ diff --git a/Breeze-dark-gtk/assets/scrollbar-trough-vertical@2.png b/Breeze-dark-gtk/assets/scrollbar-trough-vertical@2.png index 256a2008eccc57d8dbf0d5fe45ddbd2d8d15ded8..2aa4c4c0bac115194fa619a7f3890aa9701f5a30 100644 Binary files a/Breeze-dark-gtk/assets/scrollbar-trough-vertical@2.png and b/Breeze-dark-gtk/assets/scrollbar-trough-vertical@2.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-horizontal-hover.png b/Breeze-gtk/assets/scrollbar-slider-horizontal-hover.png index 13916c3a70d0b569d411badbe1c2adefce65d679..eb9eda7a2fac3e272344b1ef647ee9f4eaa3576e 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-horizontal-hover.png and b/Breeze-gtk/assets/scrollbar-slider-horizontal-hover.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-horizontal-hover@2.png b/Breeze-gtk/assets/scrollbar-slider-horizontal-hover@2.png index fcd24f625e6ade83b84d4520c4bbba9a4f9aa1cc..9967ebacdf07879945c194dd9b44043573ac097d 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-horizontal-hover@2.png and b/Breeze-gtk/assets/scrollbar-slider-horizontal-hover@2.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-horizontal.png b/Breeze-gtk/assets/scrollbar-slider-horizontal.png index d32c4aaad6ee87b7fc31f1bce59fa6449e70f376..9518d717a5ac6512c5af1b7d359ac2859e8b9d12 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-horizontal.png and b/Breeze-gtk/assets/scrollbar-slider-horizontal.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-horizontal@2.png b/Breeze-gtk/assets/scrollbar-slider-horizontal@2.png index 1c73bdd74e09c7e12ddfeda2bf344588f1948b77..cb735d60f42e8d12966f2f9c12a8218d725c7102 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-horizontal@2.png and b/Breeze-gtk/assets/scrollbar-slider-horizontal@2.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-vertical-hover.png b/Breeze-gtk/assets/scrollbar-slider-vertical-hover.png index a7daf10d1175e73ce61411d4a54c519374019801..23c6c3020034d566754352b1d0258490fc654465 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-vertical-hover.png and b/Breeze-gtk/assets/scrollbar-slider-vertical-hover.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-vertical-hover@2.png b/Breeze-gtk/assets/scrollbar-slider-vertical-hover@2.png index 9417998d16f70e4ca07479d0ec1cf9b610baf700..b695c7badacdb1b1dab06056a8b8ee9c1c2b8484 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-vertical-hover@2.png and b/Breeze-gtk/assets/scrollbar-slider-vertical-hover@2.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-vertical.png b/Breeze-gtk/assets/scrollbar-slider-vertical.png index 391b6c9d35e3ba2090452231bde9352cfb368eba..ac9d768eecde7e09e98c9a65b850cf88dc0c43a9 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-vertical.png and b/Breeze-gtk/assets/scrollbar-slider-vertical.png differ diff --git a/Breeze-gtk/assets/scrollbar-slider-vertical@2.png b/Breeze-gtk/assets/scrollbar-slider-vertical@2.png index 6df686bc46d1a69a0fd8bfbe58ed1942d6ef090d..37dcff9c93ba71b125a88953098a8cee1b1841d3 100644 Binary files a/Breeze-gtk/assets/scrollbar-slider-vertical@2.png and b/Breeze-gtk/assets/scrollbar-slider-vertical@2.png differ diff --git a/Breeze-gtk/assets/scrollbar-trough-horizontal.png b/Breeze-gtk/assets/scrollbar-trough-horizontal.png index 9a720fb31e2598eafd9754294b9613c583eba2b4..b5a74945a8cd45fe191c315cca8967d478c87bbd 100644 Binary files a/Breeze-gtk/assets/scrollbar-trough-horizontal.png and b/Breeze-gtk/assets/scrollbar-trough-horizontal.png differ diff --git a/Breeze-gtk/assets/scrollbar-trough-horizontal@2.png b/Breeze-gtk/assets/scrollbar-trough-horizontal@2.png index cede394eb3003ebc2406344adb63894ab4aa4850..a9fe475b157c9d7eaccfcbbfed8e9952564c10d9 100644 Binary files a/Breeze-gtk/assets/scrollbar-trough-horizontal@2.png and b/Breeze-gtk/assets/scrollbar-trough-horizontal@2.png differ diff --git a/Breeze-gtk/assets/scrollbar-trough-vertical.png b/Breeze-gtk/assets/scrollbar-trough-vertical.png index 669cf13983c07434d5afa6148c7e424999aab1ba..c89315a220864a2b01f902d94180adfa88819140 100644 Binary files a/Breeze-gtk/assets/scrollbar-trough-vertical.png and b/Breeze-gtk/assets/scrollbar-trough-vertical.png differ diff --git a/Breeze-gtk/assets/scrollbar-trough-vertical@2.png b/Breeze-gtk/assets/scrollbar-trough-vertical@2.png index c827b262115daf3556e6583a686e4ec015b4f202..3930e06efb79fff01bc25373954fc1bc58690770 100644 Binary files a/Breeze-gtk/assets/scrollbar-trough-vertical@2.png and b/Breeze-gtk/assets/scrollbar-trough-vertical@2.png differ diff --git a/generate_theme.py b/generate_theme.py index 420fd10f3334268cc2e3338e1dd714cd8b906ce4..4a70a1fea7dde6570fb06967473bbef5fc2a3461 100755 --- a/generate_theme.py +++ b/generate_theme.py @@ -447,19 +447,35 @@ def menu_arrow(color,state,alpha=1.0): arrow.arrow(color,alpha) arrow.save('menu-arrow' + state + '.png') -def scrollbar_slider(color,state,alpha=1): +def scrollbar_slider(color1,color2,color3): for scl in [1,2]: if scl == 2: ending = '@2.png' else: ending = '.png' slider = Assets(30,20,scl) - slider.rounded_rectancle(color,30,10,0,5,5,alpha) - slider.save('scrollbar-slider-horizontal' + state + ending) + slider.rounded_rectancle(color1,30,10,0,5,5,1) + slider.save('scrollbar-slider-horizontal-active' + ending) + + slider = Assets(30,20,scl) + slider.rounded_rectancle(color2,30,6,0,7,3,1) + slider.save('scrollbar-slider-horizontal-hover' + ending) + + slider = Assets(30,20,scl) + slider.rounded_rectancle(color3,30,6,0,7,3,1) + slider.save('scrollbar-slider-horizontal' + ending) slider = Assets(20,30,scl) - slider.rounded_rectancle(color,10,30,5,0,5,alpha) - slider.save('scrollbar-slider-vertical' + state + ending) + slider.rounded_rectancle(color1,10,30,5,0,5,1) + slider.save('scrollbar-slider-vertical-active' + ending) + + slider = Assets(20,30,scl) + slider.rounded_rectancle(color2,6,30,7,0,3,1) + slider.save('scrollbar-slider-vertical-hover' + ending) + + slider = Assets(20,30,scl) + slider.rounded_rectancle(color3,6,30,7,0,3,1) + slider.save('scrollbar-slider-vertical' + ending) def scrollbar_trough(color): for scl in [1,2]: @@ -468,11 +484,11 @@ def scrollbar_trough(color): else: ending = '.png' trough = Assets(56,20,scl) - trough.rounded_rectancle(color,26,10,15,5,5,0.3) + trough.rounded_rectancle(color,49,6,3.5,7,3,0.3) trough.save('scrollbar-trough-horizontal' + ending) trough = Assets(20,56,scl) - trough.rounded_rectancle(color,10,26,5,15,5,0.3) + trough.rounded_rectancle(color,6,49,7,3.5,3,0.3) trough.save('scrollbar-trough-vertical' + ending) def titlebuttons(color1,color2,state): @@ -720,10 +736,7 @@ menu_arrow(window_fg.rgb,'') menu_arrow(selection_fg.rgb,'-selected') menu_arrow(window_fg.insensitive,'-insensitive',window_fg.insensitive_alpha) -scrollbar_slider(window_fg.rgb,'',alpha=0.5) -scrollbar_slider(button_hover.rgb,'-hover') -scrollbar_slider(button_active.rgb,'-active') - +scrollbar_slider(button_active.rgb,button_hover.rgb,button_active.rgb) scrollbar_trough(window_fg.rgb) titlebuttons(titlebutton.rgb,titlebutton.rgb,'')