Merge lp:~danrabbit/egtk/inline-toolbar-refactor into lp:egtk/1.0

[Danielle Foré]

This branch refactors inline toolbars to use transparent buttons (like we just did for spinbutton).

It also adds a fix that makes inline toolbars look nice when they're being used in a sourcelist (as seen in footnote).

[lp:~danrabbit/egtk/inline-toolbar-refactor]

587. By Danielle Foré on 2013-02-21

preserve selection style in album list view

[Cassidy James Blaede (cassidyjames)]

There's no active style; is that intended?

review: Needs Information

[Danielle Foré (danrabbit)]

oops you're right. My bad xD

review: Needs Fixing

[Cassidy James Blaede (cassidyjames)]

Yay code reviews for catching this stuff! ;)
On Feb 21, 2013 3:29 AM, "Daniel Fore" <email address hidden> wrote:

> Review: Needs Fixing
>
> oops you're right. My bad xD
> --
>
> https://code.launchpad.net/~danrabbit/egtk/inline-toolbar-refactor/+merge/149688
> You are reviewing the proposed merge of
> lp:~danrabbit/egtk/inline-toolbar-refactor into lp:egtk.
>

[lp:~danrabbit/egtk/inline-toolbar-refactor]

588. By Danielle Foré on 2013-02-28

active states for inline toolbar buttons

Unmerged revisions

=== modified file 'gtk-3.0/toolbar.css'
--- gtk-3.0/toolbar.css	2012-08-16 22:17:17 +0000
+++ gtk-3.0/toolbar.css	2013-02-28 21:01:21 +0000
@@ -107,11 +107,12 @@
  *******************/
 
 
-.inline-toolbar.toolbar,
-.inline-toolbar.toolbar .button {
+.inline-toolbar.toolbar {
 
+    -GtkToolbar-button-relief: normal;
+    -unico-inner-stroke-width: 1px;
+    border-width: 0 1px 1px 1px;
     padding: 0;
-
     -unico-border-gradient: -gtk-gradient (linear,
         left top, left bottom,
         from (shade (@bg_color, 0.70)),
@@ -123,33 +124,58 @@
 
 }
 
-.inline-toolbar.toolbar {
-    -GtkToolbar-button-relief: normal;
-    -unico-inner-stroke-width: 1px;
-}
-
-.inline-toolbar.toolbar,
-.inline-toolbar.toolbar .button:nth-child(first),
-.inline-toolbar.toolbar GtkToolButton:nth-child(first) .button {
-    border-width: 0 1px 1px 1px;
-}
-
-.inline-toolbar.toolbar .button:nth-child(first),
-.inline-toolbar.toolbar GtkToolButton:nth-child(first) .button {
-    -unico-inner-stroke-width: 1px 0 1px 1px;
+GtkPaned .inline-toolbar.toolbar {
+
+    border-width: 1px 0 0 0;
+    /*FIXME: This should probably use alpha just in case */
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@bg_color, 0.92)),
+                                     to (shade (@bg_color, 0.98)));
 }
 
 .inline-toolbar.toolbar .button {
-    border-width: 0 1px 1px 0;
-    -unico-inner-stroke-width: 1px 0 1px 0;
+    border-width: 0 0 0 1px;
+    -unico-inner-stroke-width: 0;
     -unico-outer-stroke-width: 0;
-    -unico-inner-stroke-color: alpha (shade (@theme_bg_color, 1.2), 0.5);
     -GtkButton-inner-border: 2px 4px 2px 4px;
+    padding: 0;
+    background-image: none;
+    background-color: @transparent;
+}
+
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:active:hover {
+
+    background-color: alpha (#000, 0.05);
+	background-image: none;
+
+    -unico-border-gradient: -gtk-gradient (linear,
+                     left top, left bottom,
+                     from (shade (@base_color, 0.74)),
+                     to (shade (@base_color, 0.74)));
+
+    -unico-inner-stroke-gradient: -gtk-gradient (linear,
+                    left top, left bottom,
+                    from (alpha (#000, 0.07)),
+                    to (alpha (#000, 0.03)));
+}
+
+.inline-toolbar.toolbar GtkToolButton:first-child .button,
+.inline-toolbar.toolbar .button:first-child {
+    border-width: 0;
+    -unico-inner-stroke-width: 0;
+}
+
+.inline-toolbar.toolbar GtkToolButton:last-child .button,
+.inline-toolbar.toolbar .button:last-child {
+    border-width: 0 1px 0 1px;
+    border-radius: 0 2px 2px 0;
+    -unico-outer-stroke-width: 0;
 }
 
 .inline-toolbar.toolbar .button *:insensitive,
 .inline-toolbar.toolbar .button:insensitive {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@base_color, 0.86)),
-                                     to (shade (@base_color, 0.92)));
+    background-image: none;
+    background-color: alpha (#000, 0.02);
+    color: @insensitive_color;
 }