Merge lp:~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX into lp:unity

[Brandon Schaefer]

Update the search bar cursor blinking speed based on the GNOME cursor blink speed setting.

Update the search bar cursor blinking speed based on the GNOME cursor blink speed setting.

This fixes the ABI break caused by this branch:
https://code.launchpad.net/~brandontschaefer/nux/lp.834465-fix-ABI-BREAK/+merge/258321

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3955
http://jenkins.qa.ubuntu.com/job/unity-ci/1221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/111/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1221/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

I think you should do this inside IMTextEntry instead since it's the lower level class that we share between all the the text fields (not only the search bar, but also the spread filter and lockscreen inputs).

At this point, I think you can avoid to put this inside UnitySettings at all, since I don't think we need to use this setting everywhere else, so I'd just modify that class.

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Ah, also... Since we're there, read the bool setting "cursor-blink", and if it's false we've not to blink at all.

So, in this case we might pass to nux a 0 (or -1) blinking time (and make nux to create no timeout at all in that case).

[Brandon Schaefer (brandontschaefer)]

Good idea about the cursor blink and false.

The only reason I put it in UnitySettings was because the gnome_settings_ui was already set up and the signals were already set up. Though I can re-do those bit else where so we dont expose the blink cursor speed.

[lp:~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX]

3956. By Brandon Schaefer on 2015-05-26

* Do the ABI Fix in a different branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3956
http://jenkins.qa.ubuntu.com/job/unity-ci/1233/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1233/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

3956. By Brandon Schaefer on 2015-05-26

* Do the ABI Fix in a different branch

3955. By Brandon Schaefer on 2015-05-05

* Use the GNOME cursor blink speed for the TextEntry used in the all the SearchBars

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2015-04-24 12:58:20 +0000
+++ unity-shared/SearchBar.cpp	2015-05-26 19:14:24 +0000
@@ -271,6 +271,7 @@
   showing_filters.changed.connect(sigc::mem_fun(this, &SearchBar::OnShowingFiltersChanged));
   scale.changed.connect(sigc::mem_fun(this, &SearchBar::UpdateScale));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &SearchBar::UpdateSearchBarSize)));
+  Settings::Instance().cursor_blink_speed.changed.connect(sigc::hide(sigc::mem_fun(this, &SearchBar::UpdateBlinkSpeed)));
   can_refine_search.changed.connect([this] (bool can_refine)
   {
     if (show_filter_hint_)
@@ -343,6 +344,12 @@
   SetMaximumHeight(search_bar_height);
 }
 
+void SearchBar::UpdateBlinkSpeed()
+{
+  unsigned blink_speed = Settings::Instance().cursor_blink_speed();
+  pango_entry_->SetCursorBlinkSpeed(blink_speed);
+}
+
 void SearchBar::UpdateScale(double scale)
 {
   hint_->SetMinimumSize(nux::AREA_MIN_WIDTH, nux::AREA_MIN_HEIGHT);
 
=== modified file 'unity-shared/SearchBar.h'
--- unity-shared/SearchBar.h	2015-04-24 12:58:20 +0000
+++ unity-shared/SearchBar.h	2015-05-26 19:14:24 +0000
@@ -98,6 +98,7 @@
 
   bool ShouldBeHighlighted();
   void UpdateSearchBarSize();
+  void UpdateBlinkSpeed();
   void UpdateScale(double scale);
 
   std::unique_ptr<nux::AbstractPaintLayer> bg_layer_;
 
=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2015-05-22 13:20:22 +0000
+++ unity-shared/UnitySettings.cpp	2015-05-26 19:14:24 +0000
@@ -53,9 +53,10 @@
 const std::string UBUNTU_UI_SETTINGS = "com.ubuntu.user-interface";
 const std::string SCALE_FACTOR = "scale-factor";
 
-const std::string GNOME_UI_SETTINGS = "org.gnome.desktop.interface";
-const std::string GNOME_FONT_NAME = "font-name";
-const std::string GNOME_CURSOR_SIZE = "cursor-size";
+const std::string GNOME_UI_SETTINGS  = "org.gnome.desktop.interface";
+const std::string GNOME_FONT_NAME    = "font-name";
+const std::string GNOME_CURSOR_SIZE  = "cursor-size";
+const std::string GNOME_CURSOR_BLINK = "cursor-blink-time";
 const std::string GNOME_SCALE_FACTOR = "scaling-factor";
 const std::string GNOME_TEXT_SCALE_FACTOR = "text-scaling-factor";
 
@@ -142,6 +143,10 @@
       }
     });
 
+    signals_.Add<void, GSettings*, const gchar*>(gnome_ui_settings_, "changed::" + GNOME_CURSOR_BLINK, [this] (GSettings*, const gchar* t) {
+      UpdateCursorBlinkSpeed();
+    });
+
     signals_.Add<void, GSettings*, const gchar*>(lim_settings_, "changed", [this] (GSettings*, const gchar*) {
       UpdateLimSetting();
     });
@@ -153,6 +158,7 @@
     UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateDPI))));
 
     // The order is important here, DPI is the last thing to be updated
+    UpdateCursorBlinkSpeed();
     UpdateLimSetting();
     UpdateTextScaleFactor();
     UpdateCursorScaleFactor();
@@ -195,6 +201,11 @@
     cached_double_click_activate_ = g_settings_get_boolean(usettings_, DOUBLE_CLICK_ACTIVATE.c_str());
   }
 
+  void UpdateCursorBlinkSpeed()
+  {
+    parent_->cursor_blink_speed = g_settings_get_int(gnome_ui_settings_, GNOME_CURSOR_BLINK.c_str());
+  }
+
   void UpdateLimSetting()
   {
     parent_->lim_movement_thresold = g_settings_get_uint(lim_settings_, CLICK_MOVEMENT_THRESHOLD.c_str());
 
=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2015-05-22 13:20:22 +0000
+++ unity-shared/UnitySettings.h	2015-05-26 19:14:24 +0000
@@ -54,6 +54,7 @@
   nux::ROProperty<bool> double_click_activate;
   nux::Property<unsigned> lim_movement_thresold;
   nux::Property<unsigned> lim_double_click_wait;
+  nux::Property<int> cursor_blink_speed;
   nux::Property<bool> lim_unfocused_popup;
   nux::Property<double> font_scaling;
   nux::ROProperty<bool> remote_content;