Merge lp:~elementary-pantheon/granite/about-gtk-3.14 into lp:~elementary-pantheon/granite/granite

[Danielle Foré]

Remove all the custom drawing code in in Granite's About dialog

This branch removes a TON of crazy custom drawing stuff and uses a regular old Gtk.Dialog

[Danielle Foré (danrabbit)]

I'm not sure why there is massive amounts of padding in the hbox. The dialog is being stretched out really wide. I tried reducing the padding, but I don't exactly know what I'm doing here :p

If someone wants to rewrite all this craziness with Gtk.Grid that would probably be cool

[Danielle Foré (danrabbit)]

Corentin says to revert the changes regarding action area since this was just recently addressed upstream in Gtk

review: Needs Fixing

[Danielle Foré (danrabbit)]

I reverted changes to the way buttons are added to the action area :)

[Robert Roth (evfool)]

Looks ok, tested the changes, it works as expected, but with much less code.

review: Approve

=== modified file 'lib/Widgets/AboutDialog.vala'
--- lib/Widgets/AboutDialog.vala	2014-04-05 08:35:38 +0000
+++ lib/Widgets/AboutDialog.vala	2014-07-26 22:09:32 +0000
@@ -69,53 +69,22 @@
 
         private Granite.Drawing.BufferSurface buffer;
 
-        private const string HELP_BUTTON_STYLESHEET = """
-            .help_button {
-                border-radius: 200px;
-            }
-        """;
-
-        int shadow_blur = 15;
-        int shadow_x    = 0;
-        int shadow_y    = 2;
-        double shadow_alpha = 0.3;
-
         /**
          * Creates a new Granite.Widgets.AboutDialog
          */
         public AboutDialog () {
             Box action_area = (Box) get_action_area ();
 
-            var draw_ref = new Gtk.Window ();
-            draw_ref.get_style_context ().add_class (StyleClass.CONTENT_VIEW_WINDOW);
-
-            // Apply DecoratedWindow's theming
-            DecoratedWindow.set_default_theming (draw_ref);
-
-            action_area.get_style_context ().add_class (StyleClass.CONTENT_VIEW);
-
-            this.decorated = false;
-            this.set_visual (this.get_screen ().get_rgba_visual ());
-            this.app_paintable = true;
-
-            action_area.margin = 4;
-            action_area.margin_bottom = 8;
-            this.get_content_area ().margin = 10;
-            this.get_content_area ().margin_top = 27;
-            this.get_content_area ().margin_bottom = 3;
-
             /* help button */
             help_button = new Button.with_label ("?");
-
-            Utils.set_theming (help_button, HELP_BUTTON_STYLESHEET, StyleClass.HELP_BUTTON,
-                               Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+            help_button.get_style_context ().add_class ("help_button");
 
             help_button.halign = Gtk.Align.CENTER;
             help_button.clicked.connect (() => { activate_link(help); });
 
             /* Circular help button */
             help_button.size_allocate.connect ( (alloc) => {
-            	help_button.set_size_request (alloc.height, -1);
+                help_button.set_size_request (alloc.height, -1);
             });
 
             action_area.pack_end (help_button, false, false, 0);
@@ -144,56 +113,9 @@
 
             this.height_request = 282;
 
-            var w = -1;
-            var h = -1;
-            this.size_allocate.connect ( () => {
-                if (this.get_allocated_width () == w && this.get_allocated_height () == h)
-                    return;
-                w = this.get_allocated_width ();
-                h = this.get_allocated_height ();
-
-                this.buffer = new Granite.Drawing.BufferSurface (w, h);
-
-                this.buffer.context.rectangle (shadow_blur + shadow_x,
-                    shadow_blur + shadow_y, w - shadow_blur*2 + shadow_x, h - shadow_blur*2 + shadow_y);
-                this.buffer.context.set_source_rgba (0, 0, 0, shadow_alpha);
-                this.buffer.context.fill ();
-                this.buffer.exponential_blur (shadow_blur / 2);
-
-                draw_ref.get_style_context ().render_activity (this.buffer.context, shadow_blur + shadow_x,
-                    shadow_blur + shadow_y, w - shadow_blur*2 + shadow_x, h - shadow_blur*2 + shadow_y);
-
-            });
-
-            /*draw the buffer*/
-            this.draw.connect ( (ctx) => {
-                if (buffer == null)
-                    return false;
-
-                ctx.set_operator (Cairo.Operator.SOURCE);
-                ctx.rectangle (0, 0, w, h);
-                ctx.set_source_rgba (0, 0, 0, 0);
-                ctx.fill ();
-
-                ctx.set_source_surface (this.buffer.surface, 0, 0);
-                ctx.paint ();
-
-                return false;
-            });
-
-            /*allow moving the window*/
-            this.button_press_event.connect ( (e) => {
-                if (e.button == 1) {
-                    this.begin_move_drag ((int) e.button, (int) e.x_root, (int) e.y_root, e.time);
-                    return true;
-                }
-                return false;
-            });
-
-
             show_all ();
         }
     }
 
     public extern void show_about_dialog (Gtk.Window *parent, ...);
-}
+}
\ No newline at end of file