Merge lp:~azzar1/nux/lp-1050959 into lp:nux

[Andrea Azzarone]

Fix Dash scrollbar so that it does not displace Dash background texture

== Problem ==
Dash scrollbars displace Dash Background texture.

== Test ==
Visual change. N/A

[lp:~azzar1/nux/lp-1050959]

817. By Andrea Azzarone on 2013-09-20

Remove debug strings.

818. By Andrea Azzarone on 2013-09-20

Minor change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:816
http://jenkins.qa.ubuntu.com/job/nux-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/71/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:818
http://jenkins.qa.ubuntu.com/job/nux-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/73/rebuild

review: Approve (continuous-integration)

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

Overall it looks good, but there are some bad redraws on mouse over...

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

+1

review: Approve

=== modified file 'Nux/ScrollView.cpp'
--- Nux/ScrollView.cpp	2013-04-08 14:02:32 +0000
+++ Nux/ScrollView.cpp	2013-09-20 11:04:38 +0000
@@ -180,9 +180,6 @@
 
     Geometry base = GetGeometry();
 
-    if (view_layout_)
-      view_layout_->QueueDraw();
-
     GetPainter().PaintBackground(graphics_engine, base);
 
     if (m_vertical_scrollbar_enable)
@@ -274,18 +271,10 @@
     m_ViewX = GetBaseX() + m_border + m_ViewContentLeftMargin;
     m_ViewY = GetBaseY() + m_top_border + m_ViewContentTopMargin;
 
-    if (m_vertical_scrollbar_enable == false)
-      m_ViewWidth = GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
-    else
-      m_ViewWidth = GetBaseWidth() - ScrollBarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
-
+    m_ViewWidth = GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
     nuxAssertMsg(m_ViewWidth > 0, "[ScrollView::PreLayoutManagement] Invalid view width: %d", m_ViewWidth);
 
-    if (m_horizontal_scrollbar_enable == false)
-      m_ViewHeight = GetBaseHeight() - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin;
-    else
-      m_ViewHeight = GetBaseHeight() - ScrollBarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin;
-
+    m_ViewHeight = GetBaseHeight() - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin;
     nuxAssertMsg(m_ViewHeight > 0, "[ScrollView::PreLayoutManagement] Invalid view height: %d", m_ViewHeight);
 
     if (m_ViewX + _delta_x +  m_ViewContentWidth < m_ViewX + m_ViewWidth)
@@ -372,9 +361,6 @@
 
   long ScrollView::PostLayoutManagement(long LayoutResult)
   {
-    int ScrollBarWidth = 0;
-    int ScrollBarHeight = 0;
-
     if (view_layout_)
     {
       m_ViewContentX = view_layout_->GetBaseX();
@@ -383,16 +369,10 @@
       m_ViewContentHeight = view_layout_->GetBaseHeight();
     }
 
-    if (m_horizontal_scrollbar_enable)
-      ScrollBarHeight = _hscrollbar->GetBaseHeight();
-
-    if (m_vertical_scrollbar_enable)
-      ScrollBarWidth = _vscrollbar->GetBaseWidth();
-
     _hscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
                                   GetBaseY() + m_top_border + m_ViewContentTopMargin,
-                                  GetBaseWidth() - ScrollBarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
-                                  GetBaseHeight() - ScrollBarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
+                                  GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
+                                  GetBaseHeight() - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
 
     if (m_horizontal_scrollbar_enable)
     {
@@ -418,8 +398,8 @@
 
     _vscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
                                   GetBaseY() + m_top_border + m_ViewContentTopMargin,
-                                  GetBaseWidth() - ScrollBarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
-                                  GetBaseHeight() - ScrollBarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
+                                  GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
+                                  GetBaseHeight() - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
 
     if (m_vertical_scrollbar_enable)
     {
@@ -470,16 +450,8 @@
     m_ViewX = GetBaseX() + m_border + m_ViewContentLeftMargin;
     m_ViewY = GetBaseY() + m_top_border + m_ViewContentTopMargin;
 
-    if (m_vertical_scrollbar_enable == false)
-      m_ViewWidth = GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
-    else
-      m_ViewWidth = GetBaseWidth() - w - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
-
-    if (m_horizontal_scrollbar_enable == false)
-      m_ViewHeight = GetBaseHeight() - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin;
-    else
-      m_ViewHeight = GetBaseHeight() - h - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin;
-
+    m_ViewWidth = GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
+    m_ViewHeight = GetBaseHeight() - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin;
 
     if (m_ViewX + _delta_x +  m_ViewContentWidth < m_ViewX + m_ViewWidth)
     {