Merge lp:~unity-team/unity/unity.fix-750374 into lp:unity

[Mirco Müller]

Adapt to late design-change. Remove state-handling for vertical Dash-scrollbar. Change rendering of said scrollbar. Fixes LP: #750374

[David Barth (dbarth)]

line 319: is the returned value always defined? the next line relies on that assumption.

review: Needs Information

[Mirco Müller (macslow)]

Added additional checks to protect against potential segfaults.

[David Barth (dbarth)]

LTGM

review: Approve

[Gord Allott (gordallott)]

+1

review: Approve

=== modified file 'src/PlacesVScrollBar.cpp'
--- src/PlacesVScrollBar.cpp	2011-04-10 16:45:40 +0000
+++ src/PlacesVScrollBar.cpp	2011-04-13 09:01:38 +0000
@@ -25,33 +25,10 @@
 const int BLUR_SIZE                =  7;
 
 PlacesVScrollBar::PlacesVScrollBar (NUX_FILE_LINE_DECL)
-  : VScrollBar (NUX_FILE_LINE_PARAM)
+  : VScrollBar (NUX_FILE_LINE_PARAM),
+    _slider (NULL),
+    _track (NULL)
 {
-  m_SlideBar->OnMouseEnter.connect (sigc::mem_fun (this,
-                                 &PlacesVScrollBar::RecvMouseEnter));
-
-  m_SlideBar->OnMouseLeave.connect (sigc::mem_fun (this,
-                                 &PlacesVScrollBar::RecvMouseLeave));
-
-  m_SlideBar->OnMouseDown.connect (sigc::mem_fun (this,
-                                &PlacesVScrollBar::RecvMouseDown));
-
-  m_SlideBar->OnMouseUp.connect (sigc::mem_fun (this,
-                              &PlacesVScrollBar::RecvMouseUp));
-
-  m_SlideBar->OnMouseDrag.connect (sigc::mem_fun (this,
-                                &PlacesVScrollBar::RecvMouseDrag));
-
-  _drag    = false;
-  _entered = false;
-
-  _slider[STATE_OFF]  = NULL;
-  _slider[STATE_OVER] = NULL;
-  _slider[STATE_DOWN] = NULL;
-  _track              = NULL;
-
-  _state = STATE_OFF;
-
   m_SlideBar->SetMinimumSize (PLACES_VSCROLLBAR_WIDTH + 2 * BLUR_SIZE,
                               PLACES_VSCROLLBAR_HEIGHT + 2 * BLUR_SIZE);
   m_Track->SetMinimumSize (PLACES_VSCROLLBAR_WIDTH + 2 * BLUR_SIZE,
@@ -62,84 +39,14 @@
 
 PlacesVScrollBar::~PlacesVScrollBar ()
 {
-  if (_slider[STATE_OFF])
-    _slider[STATE_OFF]->UnReference ();
-
-  if (_slider[STATE_OVER])
-    _slider[STATE_OVER]->UnReference ();
-
-  if (_slider[STATE_DOWN])
-    _slider[STATE_DOWN]->UnReference ();
+  if (_slider)
+    _slider->UnReference ();
 
   if (_track)
     _track->UnReference ();
 }
 
 void
-PlacesVScrollBar::RecvMouseEnter (int           x,
-                                  int           y,
-                                  unsigned long button_flags,
-                                  unsigned long key_flags)
-{
-  _entered = true;
-  if (!_drag)
-  {
-    _state = STATE_OVER;
-    NeedRedraw ();
-  }
-}
-
-void
-PlacesVScrollBar::RecvMouseLeave (int           x,
-                                  int           y,
-                                  unsigned long button_flags,
-                                  unsigned long key_flags)
-{
-  _entered = false;
-  if (!_drag)
-  {
-    _state = STATE_OFF;
-    NeedRedraw ();
-  }
-}
-
-void
-PlacesVScrollBar::RecvMouseDown (int           x,
-                                 int           y,
-                                 unsigned long button_flags,
-                                 unsigned long key_flags)
-{
-  _state = STATE_DOWN;
-  NeedRedraw ();
-}
-
-void
-PlacesVScrollBar::RecvMouseUp (int           x,
-                               int           y,
-                               unsigned long button_flags,
-                               unsigned long key_flags)
-{
-  _drag = false;
-  if (_entered)
-    _state = STATE_OVER;
-  else
-    _state = STATE_OFF;
-  NeedRedraw ();
-}
-
-void
-PlacesVScrollBar::RecvMouseDrag (int           x,
-                                 int           y,
-                                 int           dx,
-                                 int           dy,
-                                 unsigned long button_flags,
-                                 unsigned long key_flags)
-{
-  _drag = true;
-  NeedRedraw ();
-}
-
-void
 PlacesVScrollBar::PreLayoutManagement ()
 {
   nux::VScrollBar::PreLayoutManagement ();
@@ -166,7 +73,7 @@
   nux::GetPainter().PaintBackground (gfxContext, base);
 
   // check if textures have been computed... if they haven't, exit function
-  if (!_slider[STATE_OFF])
+  if (!_slider)
     return;
 
   //texxform.SetWrap (nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
@@ -194,7 +101,7 @@
                          slider_geo.y,
                          slider_geo.width,
                          slider_geo.height,
-                         _slider[_state]->GetDeviceTexture (),
+                         _slider->GetDeviceTexture (),
                          texxform,
                          color);
   }
@@ -212,145 +119,8 @@
   nux::CairoGraphics* cairoGraphics = NULL;
   cairo_t*            cr            = NULL;
   nux::NBitmapData*   bitmap        = NULL;
-  double              half_height   = 0.0f;
-
-  // update texture of off-state of slider
-  width  = m_SlideBar->GetBaseWidth ();
-  height = m_SlideBar->GetBaseHeight ();
-  cairoGraphics = new nux::CairoGraphics (CAIRO_FORMAT_ARGB32, width, height);
-  width  -= 2 * BLUR_SIZE;
-  height -= 2 * BLUR_SIZE;
-
-  cr = cairoGraphics->GetContext ();
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-  cairo_paint (cr);
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_line_width (cr, 1.0f);
-  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.75f);
-  cairoGraphics->DrawRoundedRectangle (cr,
-                                       1.0f,
-                                       BLUR_SIZE + 1.5f,
-                                       BLUR_SIZE + 1.5f,
-                                       (double) (width - 1) / 2.0f,
-                                       (double) width - 3.0f,
-                                       (double) height - 3.0f);
-  cairo_fill_preserve (cr);
-  cairoGraphics->BlurSurface (BLUR_SIZE - 3);
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-  cairo_fill_preserve (cr);
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_source_rgba (cr, 0.125f, 0.125f, 0.125f, 0.75f);
-  cairo_fill_preserve (cr);
-  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.5f);
-  cairo_stroke (cr);
-
-  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  half_height = (double) (height + 2 * BLUR_SIZE) / 2.0f;
-  cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height - 2.0f);
-  cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height - 2.0f);
-  cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height);
-  cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height);
-  cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height + 2.0f);
-  cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height + 2.0f);
-  cairo_stroke (cr);
-
-  //cairo_surface_write_to_png (cairo_get_target (cr), "/tmp/slider_off.png");
-
-  bitmap = cairoGraphics->GetBitmap ();
-
-  if (_slider[STATE_OFF])
-    _slider[STATE_OFF]->UnReference ();
-
-  _slider[STATE_OFF] = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
-  _slider[STATE_OFF]->Update (bitmap);
-
-  cairo_destroy (cr);
-  delete bitmap;
-  delete cairoGraphics;
-
-  // update texture of over-state of slider
-  width  = m_SlideBar->GetBaseWidth ();
-  height = m_SlideBar->GetBaseHeight ();
-  cairoGraphics = new nux::CairoGraphics (CAIRO_FORMAT_ARGB32, width, height);
-  width  -= 2 * BLUR_SIZE;
-  height -= 2 * BLUR_SIZE;
-
-  cr = cairoGraphics->GetContext ();
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-  cairo_paint (cr);
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_line_width (cr, 1.0f);
-  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.25f);
-  cairoGraphics->DrawRoundedRectangle (cr,
-                                       1.0f,
-                                       BLUR_SIZE + 1.5f,
-                                       BLUR_SIZE + 1.5f,
-                                       (double) (width - 1) / 2.0f,
-                                       (double) width - 3.0f,
-                                       (double) height - 3.0f);
-
-  cairo_fill_preserve (cr);
-  cairoGraphics->BlurSurface (BLUR_SIZE - 3);
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-  cairo_fill_preserve (cr);
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
-  cairo_surface_t* tmp_surf = NULL;
-  cairo_t*         tmp_cr   = NULL;
-  tmp_surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 6, 4);
-  tmp_cr = cairo_create (tmp_surf);
-  cairo_set_line_width (tmp_cr, 1.0f);
-  cairo_set_antialias (tmp_cr, CAIRO_ANTIALIAS_NONE);
-  cairo_set_operator (tmp_cr, CAIRO_OPERATOR_CLEAR);
-  cairo_paint (tmp_cr);
-  cairo_set_operator (tmp_cr, CAIRO_OPERATOR_OVER);
-  cairo_set_source_rgba (tmp_cr, 1.0f, 1.0f, 1.0f, 0.25f);
-  cairo_paint (tmp_cr);
-  cairo_set_source_rgba (tmp_cr, 1.0f, 1.0f, 1.0f, 0.5f);
-  cairo_rectangle (tmp_cr, 0.f, 0.f, 1.0f, 1.0f);
-  cairo_rectangle (tmp_cr, 1.f, 1.f, 1.0f, 1.0f);
-  cairo_rectangle (tmp_cr, 2.f, 2.f, 1.0f, 1.0f);
-  cairo_rectangle (tmp_cr, 3.f, 3.f, 1.0f, 1.0f);
-  cairo_rectangle (tmp_cr, 4.f, 0.f, 1.0f, 1.0f);
-  cairo_rectangle (tmp_cr, 5.f, 1.f, 1.0f, 1.0f);
-  cairo_fill (tmp_cr);
-  cairo_destroy (tmp_cr);
-  cairo_set_source_surface (cr, tmp_surf, BLUR_SIZE + 1.5f, BLUR_SIZE + 1.5f);
-  cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
-  //cairo_surface_write_to_png (tmp_surf, "/tmp/tmp_surf.png");
-
-  cairo_fill_preserve (cr);
-  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.5f);
-  cairo_stroke (cr);
-
-  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height - 2.0f);
-  cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height - 2.0f);
-  cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height);
-  cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height);
-  cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height + 2.0f);
-  cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height + 2.0f);
-  cairo_stroke (cr);
-
-  //cairo_surface_write_to_png (cairo_get_target (cr), "/tmp/slider_over.png");
-
-  bitmap = cairoGraphics->GetBitmap ();
-
-  if (_slider[STATE_OVER])
-    _slider[STATE_OVER]->UnReference ();
-
-  _slider[STATE_OVER] = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
-  _slider[STATE_OVER]->Update (bitmap);
-
-  cairo_destroy (cr);
-  delete bitmap;
-  delete cairoGraphics;
-
-  // update texture of down-state of slider
+
+  // update texture of slider
   width  = m_SlideBar->GetBaseWidth ();
   height = m_SlideBar->GetBaseHeight ();
   cairoGraphics = new nux::CairoGraphics (CAIRO_FORMAT_ARGB32, width, height);
@@ -375,7 +145,7 @@
   cairoGraphics->BlurSurface (BLUR_SIZE - 3);
   cairo_fill (cr);
 
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+  /*cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
   cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height - 2.0f);
   cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height - 2.0f);
@@ -383,17 +153,18 @@
   cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height);
   cairo_move_to (cr, BLUR_SIZE + 2.5f, half_height + 2.0f);
   cairo_line_to (cr, BLUR_SIZE + 2.5f + 5.0f, half_height + 2.0f);
-  cairo_stroke (cr);
+  cairo_stroke (cr);*/
 
-  //cairo_surface_write_to_png (cairo_get_target (cr), "/tmp/slider_down.png");
+  //cairo_surface_write_to_png (cairo_get_target (cr), "/tmp/slider.png");
 
   bitmap = cairoGraphics->GetBitmap ();
 
-  if (_slider[STATE_DOWN])
-    _slider[STATE_DOWN]->UnReference ();
+  if (_slider)
+    _slider->UnReference ();
 
-  _slider[STATE_DOWN] = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
-  _slider[STATE_DOWN]->Update (bitmap);
+  _slider = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
+  if (_slider)
+    _slider->Update (bitmap);
 
   cairo_destroy (cr);
   delete bitmap;
@@ -437,10 +208,10 @@
     _track->UnReference ();
 
   _track = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
-  _track->Update (bitmap);
+  if (_track)
+    _track->Update (bitmap);
 
   cairo_destroy (cr);
   delete bitmap;
   delete cairoGraphics;
-  cairo_surface_destroy (tmp_surf);
 }

=== modified file 'src/PlacesVScrollBar.h'
--- src/PlacesVScrollBar.h	2011-03-24 02:44:38 +0000
+++ src/PlacesVScrollBar.h	2011-04-13 09:01:38 +0000
@@ -27,47 +27,12 @@
 #include "Nux/VScrollBar.h"
 #include "NuxImage/CairoGraphics.h"
 
-typedef enum
-{
-  STATE_OFF = 0,
-  STATE_OVER,
-  STATE_DOWN,
-  STATE_LAST
-} State;
-
 class PlacesVScrollBar : public nux::VScrollBar
 {
   public:
     PlacesVScrollBar (NUX_FILE_LINE_PROTO);
     ~PlacesVScrollBar ();
 
-    void RecvMouseEnter (int           x,
-                         int           y,
-                         unsigned long button_flags,
-                         unsigned long key_flags);
-
-    void RecvMouseLeave (int           x,
-                         int           y,
-                         unsigned long button_flags,
-                         unsigned long key_flags);
-
-    void RecvMouseDown (int           x,
-                        int           y,
-                        unsigned long button_flags,
-                        unsigned long key_flags);
-
-    void RecvMouseUp (int           x,
-                      int           y,
-                      unsigned long button_flags,
-                      unsigned long key_flags);
-
-    void RecvMouseDrag (int           x,
-                        int           y,
-                        int           dx,
-                        int           dy,
-                        unsigned long button_flags,
-                        unsigned long key_flags);
-
   protected:
     virtual void PreLayoutManagement ();
     virtual long PostLayoutManagement (long LayoutResult);
@@ -79,11 +44,8 @@
     void UpdateTexture ();
 
   private:
-    bool                _drag;
-    bool                _entered;
-    State               _state;
-    nux::BaseTexture*   _slider[STATE_LAST];
-    nux::BaseTexture*   _track;
+    nux::BaseTexture* _slider;
+    nux::BaseTexture* _track;
 };
 
 #endif // PLACES_VSCROLLBAR_H