Merge lp:~azzar1/nux/fix-888819 into lp:nux/2.0

[Andrea Azzarone]

Makes sure that the scroll wheel works with nux::VScrollbar

[lp:~azzar1/nux/fix-888819]

531. By Andrea Azzarone on 2011-12-13

Fixes.

[Tim Penhey (thumper)]

Is there a way to fake an event and show in a test that this all works?

review: Needs Information

[Andrea Azzarone (azzar1)]

@Tim, it's how nux scrollbars work :) By the way I can write a simple test.

[lp:~azzar1/nux/fix-888819]

532. By Andrea Azzarone on 2011-12-19

Add a simple test.

[Andrea Azzarone (azzar1)]

> Is there a way to fake an event and show in a test that this all works?

Done. I've used

  test.ViewSendMouseClick(bla bla bla, 4);

to fake a mouse scroll in the test.

[Jay Taoko (jaytaoko)]

@Andrea

When using the default scrollbar in Nux the mouse wheel over the scrollbar works. However, that wasn't the case with the scrollbar defined in Unity (with custom rendering).
The fix in Nux/ScrollView.cpp is correct. However, I think there is no need for the fix in Nux/VScrollBar.cpp. Can you test your fix without the change to Nux/VScrollBar.cpp and report what happens?

review: Needs Information

[lp:~azzar1/nux/fix-888819]

533. By Andrea Azzarone on 2012-01-02

Fixes.

[Andrea Azzarone (azzar1)]

> @Andrea
>
> When using the default scrollbar in Nux the mouse wheel over the scrollbar
> works. However, that wasn't the case with the scrollbar defined in Unity (with
> custom rendering).
> The fix in Nux/ScrollView.cpp is correct. However, I think there is no need
> for the fix in Nux/VScrollBar.cpp. Can you test your fix without the change to
> Nux/VScrollBar.cpp and report what happens?

Done.

[lp:~azzar1/nux/fix-888819]

534. By Andrea Azzarone on 2012-01-02

Ops.

535. By Andrea Azzarone on 2012-01-02

Update abi version.

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'Nux/ScrollView.cpp'
--- Nux/ScrollView.cpp	2011-10-17 20:57:35 +0000
+++ Nux/ScrollView.cpp	2012-01-02 22:23:24 +0000
@@ -100,6 +100,9 @@
                                                      &ScrollView::ScrollUp));
       _vscrollbar->OnScrollDown.connect(sigc::mem_fun(this,
                                                        &ScrollView::ScrollDown));
+      _vscrollbar->mouse_wheel.connect(sigc::mem_fun(this,
+                                                     &ScrollView::RecvMouseWheel));
+      
       _vscrollbar->UnReference();
     }
 
@@ -113,6 +116,8 @@
                                                    &ScrollView::ScrollUp));
     _vscrollbar->OnScrollDown.connect(sigc::mem_fun(this,
                                                      &ScrollView::ScrollDown));
+    _vscrollbar->mouse_wheel.connect(sigc::mem_fun(this,
+                                                   &ScrollView::RecvMouseWheel));
   }
 
   ScrollView::~ScrollView()

=== modified file 'Nux/VScrollBar.h'
--- Nux/VScrollBar.h	2011-10-10 01:52:00 +0000
+++ Nux/VScrollBar.h	2012-01-02 22:23:24 +0000
@@ -91,8 +91,6 @@
     float m_color_factor;
 
   protected:
-    void RecvMouseWheel(int x, int y, int wheel_delta,  long button_flags, unsigned long key_flags);
-
     // When the Scrollbar is used standalone, it is necessary to call ComputeScrolling at the end of the layout.
     virtual long PostLayoutManagement(long LayoutResult);
 

=== modified file 'configure.ac'
--- configure.ac	2011-12-08 17:50:54 +0000
+++ configure.ac	2012-01-02 22:23:24 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # So far there is no provision for more than one break in a day.
-m4_define([nux_abi_version], [20111208])
+m4_define([nux_abi_version], [20111209])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2011-12-11 18:26:59 +0000
+++ tests/Makefile.am	2012-01-02 22:23:24 +0000
@@ -9,7 +9,8 @@
   mouse-buttons-test \
   hgrid-key-navigation-test \
   hlayout-key-navigation-test \
-  vlayout-key-navigation-test
+  vlayout-key-navigation-test \
+  scrollbar-test
 
 # Please keep alphabetical
 test_nux_SOURCES = \
@@ -178,6 +179,21 @@
 vlayout_key_navigation_test_LDFLAGS = -lpthread -lXtst
 
 
+scrollbar_test_SOURCES = scrollbar-test.cpp \
+  nux_test_framework.cpp \
+  nux_test_framework.h \
+  nux_automated_test_framework.cpp \
+  nux_automated_test_framework.h \
+  test-scrollview.cpp \
+  test-scrollview.h \
+  test-view.cpp \
+  test-view.h
+
+scrollbar_test_CPPFLAGS = $(TestFlags)
+scrollbar_test_LDADD = $(TestLibs)
+scrollbar_test_LDFLAGS = -lpthread -lXtst
+
+
 #run make test as part of make check
 check-local: test gtest test-apps
 
@@ -187,7 +203,7 @@
 gtest: gtest-nux-core
 	./gtest-nux-core
 
-test-apps: test-graphics-display test-empty-window button-xtest mouse-events-test mouse-buttons-test hgrid-key-navigation-test hlayout-key-navigation-test vlayout-key-navigation-test
+test-apps: test-graphics-display test-empty-window button-xtest mouse-events-test mouse-buttons-test hgrid-key-navigation-test hlayout-key-navigation-test vlayout-key-navigation-test scrollbar-test
 	./test-graphics-display
 	./test-empty-window
 	./button-xtest
@@ -196,6 +212,7 @@
 	./hgrid-key-navigation-test
 	./hlayout-key-navigation-test
 	./vlayout-key-navigation-test
+	./scrollbar-test
 
 check-report:
 	@gtester -k -o=test-nux-results.xml -k ./test-nux \

=== added file 'tests/scrollbar-test.cpp'
--- tests/scrollbar-test.cpp	1970-01-01 00:00:00 +0000
+++ tests/scrollbar-test.cpp	2012-01-02 22:23:24 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2011 Inalogic Inc.
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#include "Nux/Nux.h"
+#include "Nux/WindowThread.h"
+#include "Nux/VLayout.h"
+#include <X11/extensions/XTest.h>
+#include <X11/keysym.h> 
+#include "nux_test_framework.h"
+#include "nux_automated_test_framework.h"
+#include "test-scrollview.h"
+#include "test-view.h"
+
+class ScrollBarTest : public NuxTestFramework
+{
+public:
+  ScrollBarTest(const char* program_name, int window_width, int window_height, int program_life_span);
+  ~ScrollBarTest();
+
+  virtual void UserInterfaceSetup();
+  
+  nux::VLayout* layout_;
+  TestScrollView* scroll_view_;
+  nux::VLayout* in_layout_;
+  TestView* test_view_;
+};
+
+ScrollBarTest::ScrollBarTest(const char *program_name,
+                             int window_width,
+                             int window_height,
+                             int program_life_span)
+  : NuxTestFramework(program_name, window_width, window_height, program_life_span)
+{
+}
+
+ScrollBarTest::~ScrollBarTest()
+{
+}
+
+void ScrollBarTest::UserInterfaceSetup()
+{  
+  layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
+  layout_->SetPadding(20, 20);
+
+  scroll_view_ = new TestScrollView();
+  layout_->AddView(scroll_view_);
+  
+  in_layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
+  scroll_view_->SetLayout(in_layout_);
+  
+  test_view_ = new TestView();
+  test_view_->SetMinimumHeight(1000);
+  in_layout_->AddView(test_view_);
+  
+  static_cast<nux::WindowThread*>(window_thread_)->SetLayout(layout_);
+  
+  nux::ColorLayer background(nux::Color(0xFF4D4D4D));
+  static_cast<nux::WindowThread*>(window_thread_)->SetWindowBackgroundPaintLayer(&background);
+}
+
+ScrollBarTest* scrollbar_test;
+
+void TestingThread(nux::NThread *thread, void *user_data)
+{
+  while (scrollbar_test->ReadyToGo() == false)
+  {
+    nuxDebugMsg("Waiting to start");
+    nux::SleepForMilliseconds(300);
+  }
+  nux::SleepForMilliseconds(1000);
+
+  nux::WindowThread *wnd_thread = static_cast<nux::WindowThread*>(user_data);
+  NuxAutomatedTestFramework test(wnd_thread);
+  test.Startup();
+
+  test.TestReportMsg(scrollbar_test->scroll_view_, "TestScrollView created");
+  
+  scrollbar_test->scroll_view_->ResetEvents();
+  test.ViewSendMouseMotionToCenter(scrollbar_test->scroll_view_);
+  test.ViewSendMouseClick(scrollbar_test->scroll_view_, 4);
+  nux::SleepForMilliseconds(1000);
+  test.TestReportMsg(scrollbar_test->scroll_view_->registered_scroll_, "Scroll on the center of the scrollview");
+  
+  
+  scrollbar_test->scroll_view_->ResetEvents();
+  test.ViewSendMouseMotionToCenter(scrollbar_test->scroll_view_->GetVScrollbar());
+  test.ViewSendMouseClick(scrollbar_test->scroll_view_->GetVScrollbar(), 4);
+  nux::SleepForMilliseconds(1000);
+  test.TestReportMsg(scrollbar_test->scroll_view_->registered_scroll_, "Scroll on the scrollbar");
+
+  if (test.WhenDoneTerminateProgram())
+  {
+    nux::SleepForMilliseconds(1000);
+    wnd_thread->NuxMainLoopQuit();
+  }
+  nuxDebugMsg("Exit testing thread");
+}
+
+int main(int argc, char **argv)
+{
+  int xstatus = XInitThreads();
+  nuxAssertMsg(xstatus > 0, "XInitThreads has failed");
+
+  scrollbar_test = new ScrollBarTest("Scrollbar Test", 500, 400, 13000);
+  scrollbar_test->Startup();
+  scrollbar_test->UserInterfaceSetup();
+
+  nux::SystemThread* test_thread = nux::CreateSystemThread(scrollbar_test->GetWindowThread(), &TestingThread, scrollbar_test->GetWindowThread());
+
+  test_thread->Start(scrollbar_test);
+
+  scrollbar_test->Run();
+
+  delete test_thread;
+  delete scrollbar_test;
+
+  return 0;
+}
+
+
+

=== added file 'tests/test-scrollview.cpp'
--- tests/test-scrollview.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-scrollview.cpp	2012-01-02 22:23:24 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2011 Inalogic Inc.
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+ 
+#include "Nux/Nux.h"
+#include "test-scrollview.h"
+
+/*
+  TestScrollView:
+    This class is a Nux scrollview that process the mouse wheel events
+    to make sure that everyghing work well.
+*/
+
+NUX_IMPLEMENT_OBJECT_TYPE(TestScrollView);
+
+TestScrollView::TestScrollView(NUX_FILE_LINE_DECL)
+  : nux::ScrollView(NUX_FILE_LINE_PARAM)
+  , registered_scroll_(false)
+  , normal_color_(nux::color::Green)
+  , current_color_(normal_color_)
+{
+  EnableVerticalScrollBar(true);
+  EnableHorizontalScrollBar(true);
+  
+  scrolling.connect(sigc::mem_fun(this, &TestScrollView::OnScrolling));
+}
+
+TestScrollView::~TestScrollView()
+{
+
+}
+
+void TestScrollView::ResetEvents()
+{   
+  registered_scroll_ = false;
+  
+  current_color_ = normal_color_; 
+}
+
+nux::Color TestScrollView::GetColor() const
+{
+  return current_color_;
+}
+
+void TestScrollView::Draw(nux::GraphicsEngine &graphics_engine, bool force_draw)
+{
+  nux::Geometry geo = GetGeometry();
+  graphics_engine.QRP_Color(geo.x, geo.y, geo.width, geo.height, current_color_);
+}
+
+void TestScrollView::OnScrolling(int hscroll, int vscroll)
+{
+  registered_scroll_ = true;
+
+  QueueDraw();
+}
+

=== added file 'tests/test-scrollview.h'
--- tests/test-scrollview.h	1970-01-01 00:00:00 +0000
+++ tests/test-scrollview.h	2012-01-02 22:23:24 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 Inalogic Inc.
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+ 
+#ifndef TEST_SCROLLVIEW_H
+#define TEST_SCROLLVIEW_H
+
+#include "Nux/ScrollView.h"
+#include "Nux/VScrollBar.h"
+
+class TestScrollView: public nux::ScrollView
+{
+  NUX_DECLARE_OBJECT_TYPE(TestView, ScrollView);
+public:
+  TestScrollView(NUX_FILE_LINE_PROTO);
+  ~TestScrollView();
+
+  nux::Color GetColor() const;
+  void ResetEvents();
+  nux::VScrollBar* GetVScrollbar() {return _vscrollbar;}
+  
+  bool registered_scroll_;
+
+protected:
+  void Draw(nux::GraphicsEngine &graphics_engine, bool force_draw);
+  void OnScrolling(int hscroll, int vscroll);
+  
+private:
+  nux::Color normal_color_;
+  nux::Color current_color_;
+
+};
+
+#endif // TEST_VIEW_H
+