Merge lp:~tombeckmann/granite/decoratedwindow-dialog into lp:~elementary-pantheon/granite/granite

[Tom Beckmann]

Inherit from GtkDialog, so we get the escape closing and the wm knows what kind of window we actually got.

[Cody Garver (codygarver)]

When I launched Noise and right clicked on a playlist to access a lightwindow everything froze.

review: Needs Fixing

[Victor Martinez (victored)]

Good call.

Diff line 63 is not needed, since Utils.set_theming will add the style class as well:
63 + this.get_style_context ().add_class (StyleClass.COMPOSITED);

Since this change implies an API/ABI break, you could post-pone the merge until Luna is released.

[Rico Tzschichholz (ricotz)]

If I got this right then just set the type_hint to DIALOG and move the Escape-Key handling from LightWindow up to DecoratedWindow which will accomplish that without breaking things.

Unmerged revisions

518. By Tom Beckmann on 2013-01-14

Remove tabs

517. By Tom Beckmann on 2013-01-14

decoratedwindow: inherited from GtkDialog to gain the close-on-escape and help the wm

=== modified file 'demo/main.vala'
--- demo/main.vala	2012-11-30 18:06:35 +0000
+++ demo/main.vala	2013-01-14 17:09:26 +0000
@@ -343,7 +343,7 @@
     }
 
     private void show_light_window () {
-        var light_window = new Granite.Widgets.LightWindow ();
+        var light_window = new Granite.Widgets.LightWindow ("Properties");
         
         var light_window_notebook = new Granite.Widgets.StaticNotebook ();
         var entry = new Gtk.Entry ();
@@ -385,8 +385,6 @@
         open_drop.append ("audience", "Audience");
         open_drop.active = 0;
         grid.margin = 12;
-        grid.margin_top = 24;
-        grid.margin_bottom = 24;
         entry.text = "Cool Hand Luke";
         general.column_spacing = 6;
         general.row_spacing = 6;
 
=== modified file 'lib/Widgets/CompositedWindow.vala'
--- lib/Widgets/CompositedWindow.vala	2012-12-21 00:46:56 +0000
+++ lib/Widgets/CompositedWindow.vala	2013-01-14 17:09:26 +0000
@@ -25,7 +25,7 @@
      */
     public class CompositedWindow : Gtk.Window, Gtk.Buildable {
 
-        private const string STYLESHEET =
+        internal static const string STYLESHEET =
             ".composited { background-color: rgba (0,0,0,0); }";
 
         construct {
 
=== modified file 'lib/Widgets/DecoratedWindow.vala'
--- lib/Widgets/DecoratedWindow.vala	2012-12-21 00:46:56 +0000
+++ lib/Widgets/DecoratedWindow.vala	2013-01-14 17:09:26 +0000
@@ -25,7 +25,7 @@
     /**
      * This class is a standard decorated window.
      */
-    public class DecoratedWindow : CompositedWindow {
+    public class DecoratedWindow : Gtk.Dialog {
 
         const string DECORATED_WINDOW_FALLBACK_STYLESHEET = """
             .decorated-window {
@@ -90,6 +90,9 @@
          * @param content_style style to set content to
          */
         public DecoratedWindow (string title = "", string? window_style = null, string? content_style = null) {
+            this.app_paintable = true;
+            this.set_visual (Gdk.Screen.get_default ().get_rgba_visual ());
+            this.decorated = false;
             this.resizable = false;
             this.has_resize_grip = false;
             this.window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
@@ -124,6 +127,11 @@
 
             this.draw_ref = new Gtk.Window ();
 
+            // make our window transparent
+            this.get_style_context ().add_class (StyleClass.COMPOSITED);
+            Utils.set_theming (this, CompositedWindow.STYLESHEET, StyleClass.COMPOSITED,
+                               Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
             // set theming
             set_default_theming (this.draw_ref);
 
@@ -135,7 +143,7 @@
                 this.box.get_style_context ().add_class (content_style);
 
             this.box.pack_start (this._title, false);
-            base.add (this.box);
+            get_content_area ().add (this.box);
 
             this.add_events (Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK);
             this.motion_notify_event.connect (on_motion_notify);