[geary/wip/714793-orientation] Fix frame borders in vertical orientation



commit 69e06d6c2fb8f1a13991839b792061d942e785d6
Author: Robert Schroll <rschroll gmail com>
Date:   Fri Feb 20 19:14:21 2015 -0500

    Fix frame borders in vertical orientation

 src/client/components/main-window.vala       |   23 ++++++++++++++++-------
 src/client/folder-list/folder-list-tree.vala |    2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index 1966fe4..672f21e 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -143,14 +143,17 @@ public class MainWindow : Gtk.ApplicationWindow {
         Gtk.CssProvider provider = new Gtk.CssProvider();
         Gtk.StyleContext.add_provider_for_screen(Gdk.Display.get_default().get_default_screen(),
             provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        // Gtk < 3.14: No borders along top or left side of window
         string css = """
-            .folder_frame {
+            .folder-frame {
                 border-left-width: 0px;
                 border-top-width: 0px;
             }
-            .conversation_frame {
+            .sidebar-pane-separator.horizontal .conversation-frame {
                 border-top-width: 0px;
-                border-bottom-width: 0px;
+            }
+            .sidebar-pane-separator.vertical .conversation-frame {
+                border-left-width: 0px;
             }
             ComposerBox {
                 border-left-width: 0px;
@@ -175,12 +178,18 @@ public class MainWindow : Gtk.ApplicationWindow {
         """;
         
         if(Gtk.MAJOR_VERSION >= 3 && Gtk.MINOR_VERSION >= 14) {
+            // Gtk >= 3.14: Borders only along status bar
             css += """
-                  .folder_frame {
+                  .folder-frame {
                       border-right-width: 0px;
                   }
-                  .conversation_frame {
-                      border-width: 0px;
+                  .sidebar-pane-separator.vertical .folder-frame {
+                      border-bottom-width: 0px;
+                  }
+                  .conversation-frame {
+                      border-top-width: 0px;
+                      border-left-width: 0px;
+                      border-right-width: 0px;
                   }
             """;
         }
@@ -202,7 +211,7 @@ public class MainWindow : Gtk.ApplicationWindow {
         conversation_list_scrolled.add(conversation_list_view);
         Gtk.Frame conversation_frame = new Gtk.Frame(null);
         conversation_frame.shadow_type = Gtk.ShadowType.IN;
-        conversation_frame.get_style_context ().add_class ("conversation_frame");
+        conversation_frame.get_style_context ().add_class ("conversation-frame");
         conversation_frame.add(conversation_list_scrolled);
         
         // Three-pane display.
diff --git a/src/client/folder-list/folder-list-tree.vala b/src/client/folder-list/folder-list-tree.vala
index 64dcbc9..d82d1a2 100644
--- a/src/client/folder-list/folder-list-tree.vala
+++ b/src/client/folder-list/folder-list-tree.vala
@@ -61,7 +61,7 @@ public class FolderList.Tree : Gtk.Box {
         folder_list_scrolled.add(tree);
         Gtk.Frame folder_frame = new Gtk.Frame(null);
         folder_frame.shadow_type = Gtk.ShadowType.IN;
-        folder_frame.get_style_context().add_class("folder_frame");
+        folder_frame.get_style_context().add_class("folder-frame");
         folder_frame.add(folder_list_scrolled);
         
         Gtk.ComboBox combo = new Gtk.ComboBox.with_model(tree.store);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]