Merge lp:~tintou/granite/gtk3.12 into lp:~elementary-pantheon/granite/granite

[Corentin Noël]

I did change the API to simplify things, only Maya does use those two widgets and th change did not triggered problems at all.

[Rico Tzschichholz (ricotz)]

Don't change the API without giving a proper reasoning!

[Danielle Foré (danrabbit)]

Corentin, can we add 12px of margin in the timepicker and datepicker popovers? I can't do it in the theme since we need to have 0px available for the modelbutton items

review: Needs Fixing

[lp:~tintou/granite/gtk3.12]

697. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-06

Launchpad automatic translations update.

[Rico Tzschichholz (ricotz)]

If there is a need to constant adjuments use some public "const int POPOVER_PADDING" or something and reuse it for consistency.

[Rico Tzschichholz (ricotz)]

I was referring to those "rect.x = size.width - 15;" as well ;)

[Corentin Noël (tintou)]

OFFSET constant added, I did change the API to simplify things, only Maya does use those two widgets and th change did not triggered problems at all.

[lp:~tintou/granite/gtk3.12]

698. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-07

Launchpad automatic translations update.

699. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-11

Launchpad automatic translations update.

700. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-12

Launchpad automatic translations update.

701. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-14

Launchpad automatic translations update.

702. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-17

Launchpad automatic translations update.

703. By Rico Tzschichholz on 2014-03-19

datepicker: Fix typo, luckily vala seems to correct it automagically

704. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-22

Launchpad automatic translations update.

705. By Victor Martinez on 2014-03-23

Only show close buttons for active or hovered tabs. Fixes lp:1205236

The implementation uses Gtk.Revealer to animate close buttons.

706. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-24

Launchpad automatic translations update.

707. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-27

Launchpad automatic translations update.

708. By Launchpad Translations on behalf of elementary-pantheon on 2014-03-30

Launchpad automatic translations update.

709. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-02

Launchpad automatic translations update.

710. By Sergey "Shnatsel" Davidoff on 2014-04-05

ContractorProxy: Improve documentation.

711. By Victor Martinez on 2014-04-05

ThinPaned: make sure the handle follows the cursor position when using client-side decorations. Fixes lp:1302314

712. By Sergey "Shnatsel" Davidoff on 2014-04-05

Document IconFactory and CellRendererBadge classes, misc Contractor documentation fixes, added a description for DynamicNotebook

713. By Danielle Foré on 2014-04-06

update 24px "application-menu" for dark toolbars

714. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-08

Launchpad automatic translations update.

715. By Sergey "Shnatsel" Davidoff on 2014-04-08

Documentation: Add screenshots for OverlayBar, AboutDialog, DynamicNotebook, Welcome, LightWindow and ModeButton.

716. By Sergey "Shnatsel" Davidoff on 2014-04-09

Documentation: Add descriptions for Granite.Services.Contract and Granite.Services.ContractorError.

717. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-10

Launchpad automatic translations update.

718. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-14

Launchpad automatic translations update.

719. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-16

Launchpad automatic translations update.

720. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-17

Launchpad automatic translations update.

721. By Victor Martinez on 2014-04-18

Style class: Change "granite-overlay-bar" to "overlay-bar". Fixes lp:1309713

722. By Sergey "Shnatsel" Davidoff on 2014-04-19

Deprecate HintedEntry and SearchBar because GTK has those since 3.6

723. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-21

Launchpad automatic translations update.

724. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-24

Launchpad automatic translations update.

725. By Launchpad Translations on behalf of elementary-pantheon on 2014-04-25

Launchpad automatic translations update.

726. By Corentin Noël on 2014-04-27

new version synced with trunk.
do not break the API.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-23 19:07:04 +0000
+++ CMakeLists.txt	2014-04-27 22:26:07 +0000
@@ -28,7 +28,7 @@
 include (ValaVersion)
 include (ValaPrecompile)
 
-ensure_vala_version ("0.20.1" MINIMUM)
+ensure_vala_version ("0.23.2" MINIMUM)
 
 #
 # Packages in PKG_DEPS are used with the vala compiler and other related tools (not versioned.)
@@ -45,7 +45,7 @@
     gee-0.8)
 
 set (PKG_DEPS_CHECK
-    gtk+-3.0>=3.3.14
+    gtk+-3.0>=3.11.6
     gio-unix-2.0
     gthread-2.0
     gee-0.8)

=== modified file 'lib/Widgets/DatePicker.vala'
--- lib/Widgets/DatePicker.vala	2014-03-19 07:21:38 +0000
+++ lib/Widgets/DatePicker.vala	2014-04-27 22:26:07 +0000
@@ -27,6 +27,8 @@
      */
     public class DatePicker : Gtk.Entry, Gtk.Buildable {
 
+        const int OFFSET = 15;
+        const int MARGIN = 6;
         /**
          * Desired format of DatePicker
          */
@@ -41,7 +43,7 @@
          */
         protected Calendar calendar;
 
-        PopOver popover;
+        private Gtk.Popover popover;
 
         private GLib.DateTime _date;
 
@@ -66,8 +68,9 @@
                 format = Granite.DateTime.get_default_date_format (false, true, true);
             
             dropdown = new Gtk.EventBox ();
-            popover = new PopOver ();
-            ((Gtk.Box) popover.get_content_area ()).add (dropdown);
+            dropdown.margin = MARGIN;
+            popover = new Gtk.Popover (this);
+            popover.add (dropdown);
             calendar = new Calendar ();
             date = new GLib.DateTime.now_local ();
 
@@ -117,30 +120,20 @@
         }
 
         private void on_icon_press (EntryIconPosition position) {
-
-            int x, y;
-            position_dropdown (out x, out y);
-
+            Gdk.Rectangle rect = Gdk.Rectangle ();
+            position_dropdown (out rect);
+            popover.pointing_to = rect;
+            popover.position = Gtk.PositionType.BOTTOM;
             popover.show_all ();
-            popover.move_to_coords (x, y);
-            popover.present ();
             calendar.grab_focus ();
         }
 
-        protected virtual void position_dropdown (out int x, out int y) {
-
-            Allocation size;
-            Requisition calendar_size;
-
+        protected virtual void position_dropdown (out Gdk.Rectangle rect) {
+            Gtk.Allocation size;
             get_allocation (out size);
-            calendar.get_preferred_size (out calendar_size, null);
-            get_window ().get_origin (out x, out y);
-
-            x += size.x + size.width - 10; //size.x - (calendar_size.width - size.width);
-            y += size.y + size.height;
-
-            //x = x.clamp (0, int.max (0, Screen.width () - calendar_size.width));
-            //y = y.clamp (0, int.max (0, Screen.height () - calendar_size.height));
+
+            rect.x = size.width - OFFSET;
+            rect.y = size.height;
         }
 
         private void on_calendar_day_selected () {
@@ -156,4 +149,4 @@
             popover.hide ();
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'lib/Widgets/PopOver.vala'
--- lib/Widgets/PopOver.vala	2014-04-08 20:21:10 +0000
+++ lib/Widgets/PopOver.vala	2014-04-27 22:26:07 +0000
@@ -492,5 +492,4 @@
         cr.paint_with_alpha(1.0);
         return base.draw(cr);
     }
-}
-
+}
\ No newline at end of file

=== modified file 'lib/Widgets/TimePicker.vala'
--- lib/Widgets/TimePicker.vala	2014-02-07 16:19:37 +0000
+++ lib/Widgets/TimePicker.vala	2014-04-27 22:26:07 +0000
@@ -25,6 +25,8 @@
      */
     public class TimePicker : Gtk.Entry {
 
+        const int OFFSET = 15;
+        const int MARGIN = 6;
         // Signals
         /**
          * Sent when the time got changed
@@ -86,7 +88,7 @@
         private Gtk.Grid am_pm_grid;
         private bool changing_time = false;
 
-        private PopOver popover;
+        private Gtk.Popover popover;
 
         construct {
             if (format_12 == null)
@@ -100,11 +102,9 @@
             icon_release.connect (on_icon_press);
 
             // Creates the popover
-            popover = new PopOver ();
             var pop_grid = new Gtk.Grid ();
             pop_grid.column_spacing = 6;
             pop_grid.row_spacing = 6;
-            ((Gtk.Box) popover.get_content_area ()).add (pop_grid);
 
             am_pm_grid = new Gtk.Grid ();
             am_pm_grid.column_spacing = 6;
@@ -151,6 +151,10 @@
             pop_grid.attach (separation_label, 1, 0, 1, 1);
             pop_grid.attach (minutes_spinbutton, 2, 0, 1, 1);
             pop_grid.attach (am_pm_grid, 0, 1, 3, 1);
+            pop_grid.margin = MARGIN;
+
+            popover = new Gtk.Popover (this);
+            popover.add (pop_grid);
 
             // Connecting to events allowing manual changes
             add_events (Gdk.EventMask.FOCUS_CHANGE_MASK|Gdk.EventMask.SCROLL_MASK);
@@ -222,7 +226,7 @@
             update_text ();
         }
 
-        private void on_icon_press (Gtk.EntryIconPosition position) {
+        private void on_icon_press (Gtk.EntryIconPosition position, Gdk.Event event) {
             changing_time = true;
 
             if (Granite.DateTime.is_clock_format_12h () && time.get_hour () > 12)
@@ -249,20 +253,23 @@
             minutes_spinbutton.set_value (time.get_minute ());
             changing_time = false;
 
-            int x, y;
+            Gdk.Rectangle rect = Gdk.Rectangle ();
+            int x = 0;
+            int y = 0;
             position_dropdown (out x, out y);
+            rect.x = x;
+            rect.y = y;
+            popover.pointing_to = rect;
+            popover.position = Gtk.PositionType.BOTTOM;
             popover.show_all ();
-            popover.move_to_coords (x, y);
-            popover.present ();
         }
 
         protected virtual void position_dropdown (out int x, out int y) {
             Gtk.Allocation size;
             get_allocation (out size);
-            get_window ().get_origin (out x, out y);
 
-            x += size.x + size.width - 10;
-            y += size.y + size.height;
+            x = size.width - OFFSET;
+            y = size.height;
         }
 
         private void is_unfocused () {