Merge lp:~adam-barancsuk/unity/fix-740515 into lp:unity

[brncsk]

Fixed bug #740515.

[Sam Spilsbury (smspillaz)]

I can see how this implementation fixes the problem, but there are some weird things that you do in the implementation that don't make sense to me.

First of all, there is a hardcoding of the view height to 24, which could be a bad thing if we ever made the panel larger for a11y reasons. Also, you're stacking the widget from the top of the view container down, which means there's essentially going to be a larger "dead area" at the bottom of the panel.

I think a better idea here would be to stack the object in the center of the panel (that way it grows from the center if the panel was to get larger) and set it's view height to the height of the panel. That way, whenever we get an input event there, it will always go to the button.

review: Needs Information

[Alex Launi (alexlauni)]

Rejecting since this appears to be stale, if the branch gets updated as per sam's review please submit a new merge!

Unmerged revisions

1186. By brncsk on 2011-05-06

Fixing bug #740515.

=== modified file 'src/WindowButtons.cpp'
--- src/WindowButtons.cpp	2011-04-06 17:53:41 +0000
+++ src/WindowButtons.cpp	2011-05-06 15:34:00 +0000
@@ -57,7 +57,7 @@
     nux::Geometry      geo  = GetGeometry ();
     nux::BaseTexture  *tex;
     nux::TexCoordXForm texxform;
- 
+
     GfxContext.PushClippingRectangle (geo);
 
     if (HasMouseFocus ())
@@ -78,9 +78,9 @@
     GfxContext.GetRenderStates ().SetColorMask (true, true, true, true);
     if (tex)
       GfxContext.QRP_1Tex (geo.x,
-                                geo.y,
+                                (geo.height - tex->GetHeight ()) / 2,
                                 (float)geo.width,
-                                (float)geo.height,
+                                tex->GetHeight (),
                                 tex->GetDeviceTexture (),
                                 texxform,
                                 nux::Colors::White);
@@ -104,7 +104,8 @@
     _pressed_tex = style->GetWindowButton (_type, PanelStyle::WINDOW_STATE_PRESSED);
 
     if (_normal_tex)
-      SetMinMaxSize (_normal_tex->GetWidth (), _normal_tex->GetHeight ());
+      // SetMinMaxSize (_normal_tex->GetWidth (), _normal_tex->GetHeight ());
+      SetMinMaxSize (_normal_tex->GetWidth (), 24);
 
     QueueDraw ();
   }
@@ -123,7 +124,7 @@
   WindowButton *but;
 
   but = new WindowButton (PanelStyle::WINDOW_BUTTON_CLOSE);
-  AddView (but, 0, nux::eCenter, nux::eFix);
+  AddView (but, 0, nux::eAbove, nux::eFix);
   but->sigClick.connect (sigc::mem_fun (this, &WindowButtons::OnCloseClicked));
   but->OnMouseEnter.connect (sigc::mem_fun (this, &WindowButtons::RecvMouseEnter));
   but->OnMouseLeave.connect (sigc::mem_fun (this, &WindowButtons::RecvMouseLeave));