Merge lp:~jamespharaoh/ubuntu/oneiric/unity/fix-for-880672 into lp:ubuntu/oneiric/unity

[James Pharaoh]

[Sebastien Bacher (seb128)]

thank you for your bug report, it would be better to have a merge request on the upstream lp:unity code rather than on the packaging though

[Sebastien Bacher (seb128)]

Do you think you could update that request to target the right vcs?

[Stéphane Graber (stgraber)]

Based on comments above, marking as work in progress.

[James Pharaoh (jamespharaoh)]

I will get around to this this week, I have been off for a couple of
weeks and am now catching up with a few things.

2011/11/28 Stéphane Graber <email address hidden>:
> Based on comments above, marking as work in progress.
> --
> https://code.launchpad.net/~jamespharaoh/ubuntu/oneiric/unity/fix-for-880672/+merge/80181
> You are the owner of lp:~jamespharaoh/ubuntu/oneiric/unity/fix-for-880672.
>

--
James Pharaoh
Pharaoh Systems Limited
http://phsys.co.uk/contact

Unmerged revisions

122. By James Pharaoh <email address hidden> on 2011-10-24

Raise window appropriately on title bar click when raise on click is disabled (LP: #880672)

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-07 09:03:50 +0000
+++ debian/changelog	2011-10-24 06:49:27 +0000
@@ -1,3 +1,9 @@
+unity (4.22.0-0ubuntu4) oneiric; urgency=low
+
+  * Raise window appropriately on title bar click when raise on click is disabled (LP: #880672)
+
+ -- James Pharaoh <[e-mail]>  Mon, 24 Oct 2011 08:36:23 +0200
+
 unity (4.22.0-0ubuntu3) oneiric; urgency=low
 
   * Cherry-pick upstream:

=== added file 'plugins/unityshell/src/Behaviour.cpp'
--- plugins/unityshell/src/Behaviour.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/Behaviour.cpp	2011-10-24 06:49:27 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: James Pharaoh <[e-mail]>
+ */
+
+#include "Behaviour.h"
+
+namespace unity {
+
+DefaultBehaviour::DefaultBehaviour (CompScreen* compScreen)
+  : _compScreen (compScreen) {
+}
+
+bool DefaultBehaviour::raiseOnClick () {
+  CompOption* option = _compScreen->getOption ("raise_on_click");
+  if (! option) return true;
+  return option->value ().b ();
+}
+
+} // namespace unity

=== added file 'plugins/unityshell/src/Behaviour.h'
--- plugins/unityshell/src/Behaviour.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/Behaviour.h	2011-10-24 06:49:27 +0000
@@ -0,0 +1,55 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: James Pharaoh <[e-mail]>
+ */
+
+#ifndef BEHAVIOUR_H
+#define BEHAVIOUR_H
+
+#include <core/screen.h>
+
+namespace unity {
+
+class Behaviour {
+
+public:
+  virtual bool raiseOnClick () = 0;
+};
+
+class DefaultBehaviour :
+  public Behaviour {
+
+public:
+  DefaultBehaviour (CompScreen* compScreen);
+  virtual bool raiseOnClick ();
+
+private:
+  CompScreen* _compScreen;
+};
+
+class DummyBehaviour :
+  public Behaviour {
+
+public:
+  virtual bool raiseOnClick () {
+    return false;
+  }
+};
+
+}
+
+#endif

=== modified file 'plugins/unityshell/src/PanelController.cpp'
--- plugins/unityshell/src/PanelController.cpp	2011-09-29 19:07:09 +0000
+++ plugins/unityshell/src/PanelController.cpp	2011-10-24 06:49:27 +0000
@@ -32,8 +32,9 @@
 nux::logging::Logger logger("unity.panel");
 }
 
-PanelController::PanelController()
-  : _bfb_size(66),
+PanelController::PanelController(Behaviour* behaviour)
+  : _behaviour (behaviour),
+    _bfb_size(66),
     _opacity(1.0f),
     _open_menu_start_received(false)
 {
@@ -183,7 +184,7 @@
 
       layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-      view = new PanelView();
+      view = new PanelView(_behaviour);
       view->SetMaximumHeight(24);
       view->SetOpacity(_opacity);
       view->SetPrimary(i == primary_monitor);

=== modified file 'plugins/unityshell/src/PanelController.h'
--- plugins/unityshell/src/PanelController.h	2011-09-29 19:07:09 +0000
+++ plugins/unityshell/src/PanelController.h	2011-10-24 06:49:27 +0000
@@ -25,11 +25,12 @@
 
 #include "Introspectable.h"
 #include "PanelView.h"
+#include "Behaviour.h"
 
 class PanelController : public nux::Object, public unity::Introspectable
 {
 public:
-  PanelController();
+  PanelController(unity::Behaviour* behaviour);
   ~PanelController();
 
   void StartFirstMenuShow();
@@ -55,6 +56,7 @@
                                       nux::Geometry& geo,
                                       void*          user_data);
 private:
+  unity::Behaviour* _behaviour;
   std::vector<nux::BaseWindow*> _windows;
   int _bfb_size;
   float _opacity;

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-10-07 09:03:50 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-10-24 06:49:27 +0000
@@ -62,8 +62,9 @@
                             gchar*         new_name,
                             PanelMenuView* self);
 
-PanelMenuView::PanelMenuView(int padding)
-  : _matcher(NULL),
+PanelMenuView::PanelMenuView(Behaviour* behaviour, int padding)
+  : _behaviour (behaviour),
+    _matcher(NULL),
     _title_layer(NULL),
     _util_cg(CAIRO_FORMAT_ARGB32, 1, 1),
     _gradient_texture(NULL),
@@ -1268,6 +1269,13 @@
   // showing the window shape preview effect. See bug #838923
   if (GetMaximizedWindow() != 0)
     _panel_titlebar_grab_area->SetGrabbed(true);
+
+  if (_behaviour->raiseOnClick ()) {
+    guint32 window_xid = GetMaximizedWindow();
+    WindowManager::Default()->Activate(window_xid);
+  }
+
+  _is_moved = false;
 }
 
 void
@@ -1299,13 +1307,15 @@
   {
     _panel_titlebar_grab_area->SetGrabbed(false);
 
-    WindowManager::Default()->Activate(window_xid);
     _is_inside = true;
     _is_grabbed = true;
     Refresh();
     FullRedraw();
     WindowManager::Default()->StartMove(window_xid, x, y);
   }
+
+  if (_panel_titlebar_grab_area->GetAbsoluteX() || _panel_titlebar_grab_area->GetAbsoluteY())
+    _is_moved = true;
 }
 
 void
@@ -1320,6 +1330,11 @@
   if (!_is_inside)
     _is_grabbed = false;
 
+  if (! _behaviour->raiseOnClick () && ! _is_moved) {
+    guint32 window_xid = GetMaximizedWindow();
+    WindowManager::Default()->Activate(window_xid);
+  }
+
   Refresh();
   FullRedraw();
 }

=== modified file 'plugins/unityshell/src/PanelMenuView.h'
--- plugins/unityshell/src/PanelMenuView.h	2011-10-04 15:45:58 +0000
+++ plugins/unityshell/src/PanelMenuView.h	2011-10-24 06:49:27 +0000
@@ -31,6 +31,7 @@
 #include "PanelTitlebarGrabAreaView.h"
 #include "PluginAdapter.h"
 #include "Animator.h"
+#include "Behaviour.h"
 
 #include <libbamf/libbamf.h>
 
@@ -52,7 +53,7 @@
   // It also deals with undecorating maximized windows (and redecorating them
   // on unmaximize)
 
-  PanelMenuView(int padding = 6);
+  PanelMenuView(Behaviour* behaviour, int padding = 6);
   ~PanelMenuView();
 
   void FullRedraw();
@@ -129,6 +130,8 @@
   void OnFadeOutChanged(double);
 
 private:
+  Behaviour* _behaviour;
+
   BamfMatcher* _matcher;
 
   nux::TextureLayer*       _title_layer;
@@ -140,6 +143,7 @@
   bool _is_grabbed;
   bool _is_maximized;
   bool _is_own_window;
+  bool _is_moved;
   PanelIndicatorEntryView* _last_active_view;
 
   WindowButtons* _window_buttons;

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-09-29 19:07:09 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-10-24 06:49:27 +0000
@@ -52,7 +52,7 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(PanelView);
 
-PanelView::PanelView(NUX_FILE_LINE_DECL)
+PanelView::PanelView(Behaviour* behaviour, NUX_FILE_LINE_DECL)
   :   View(NUX_FILE_LINE_PARAM),
       _is_dirty(true),
       _opacity(1.0f),
@@ -74,7 +74,7 @@
 
   _layout = new nux::HLayout("", NUX_TRACKER_LOCATION);
 
-  _menu_view = new PanelMenuView();
+  _menu_view = new PanelMenuView(behaviour);
   AddPanelView(_menu_view, 1);
 
   SetCompositionLayout(_layout);

=== modified file 'plugins/unityshell/src/PanelView.h'
--- plugins/unityshell/src/PanelView.h	2011-09-29 19:07:09 +0000
+++ plugins/unityshell/src/PanelView.h	2011-10-24 06:49:27 +0000
@@ -44,7 +44,7 @@
 {
   NUX_DECLARE_OBJECT_TYPE(PanelView, nux::View);
 public:
-  PanelView(NUX_FILE_LINE_PROTO);
+  PanelView(unity::Behaviour* behaviour, NUX_FILE_LINE_PROTO);
   ~PanelView();
 
   long ProcessEvent(nux::IEvent& ievent, long TraverseInfo, long ProcessEventInfo);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-10-05 12:04:39 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-10-24 06:49:27 +0000
@@ -116,6 +116,7 @@
   , dash_is_open_ (false)
   , grab_index_ (0)
   , painting_tray_ (false)
+  , _behaviour (screen)
 {
   Timer timer;
   gfloat version;
@@ -2384,7 +2385,7 @@
 
   /* Setup panel */
   timer.Reset();
-  self->panelController = new PanelController();
+  self->panelController = new PanelController(& self->_behaviour);
   self->AddChild(self->panelController);
   LOG_INFO(logger) << "initLauncher-Panel " << timer.ElapsedSeconds() << "s";
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-10-04 15:45:58 +0000
+++ plugins/unityshell/src/unityshell.h	2011-10-24 06:49:27 +0000
@@ -42,6 +42,7 @@
 #include "DebugDBusInterface.h"
 #include "SwitcherController.h"
 #include "UBusWrapper.h"
+#include "Behaviour.h"
 #include <Nux/WindowThread.h>
 #include <sigc++/sigc++.h>
 #include <boost/shared_ptr.hpp>
@@ -333,6 +334,8 @@
   bool                   painting_tray_;
   unsigned int           tray_paint_mask_;
 
+  unity::DefaultBehaviour _behaviour;
+
   friend class UnityWindow;
 };
 

=== modified file 'tests/TestPanel.cpp'
--- tests/TestPanel.cpp	2011-09-29 19:07:09 +0000
+++ tests/TestPanel.cpp	2011-10-24 06:49:27 +0000
@@ -31,7 +31,8 @@
 void ThreadWidgetInit(nux::NThread* thread, void* InitData)
 {
   nux::VLayout* layout = new nux::VLayout(TEXT(""), NUX_TRACKER_LOCATION);
-  unity::PanelView* view = new unity::PanelView();
+  unity::Behaviour* behaviour = new unity::DummyBehaviour ();
+  unity::PanelView* view = new unity::PanelView(behaviour);
 
   //view->SetMinMaxSize(1024, 24);
   view->SetPrimary(true);