Refactor ScrollBar, and fix keyboard navigation in listbox.

1 files changed, 13 insertions, 9 deletions

diff --git a/plugingui/listboxbasic.h b/plugingui/listboxbasic.h
index ef6aceb..1ada745 100644
--- a/plugingui/listboxbasic.h
+++ b/plugingui/listboxbasic.h
@@ -48,8 +48,8 @@ public:
 	ListBoxBasic(Widget *parent);
 	~ListBoxBasic();
 
-	void addItem(std::string name, std::string value);
-	void addItems(std::vector<Item> &items);
+	void addItem(const std::string& name, const std::string& value);
+	void addItems(const std::vector<Item>& items);
 
 	void clear();
 	bool selectItem(int index);
@@ -58,19 +58,23 @@ public:
 
 	void clearSelectedValue();
 
+	Notifier<> selectionNotifier;
+	Notifier<> clickNotifier;
+	Notifier<> valueChangedNotifier;
+
+	// From Widget:
+	virtual void resize(int w, int h) override;
+
+protected:
+	void onScrollBarValueChange(int value);
+
 	// From Widget:
 	bool isFocusable() override { return true; }
 	virtual void repaintEvent(RepaintEvent *e) override;
 	virtual void buttonEvent(ButtonEvent *e) override;
-	virtual void scrollEvent(ScrollEvent *e) override;
 	virtual void keyEvent(KeyEvent *e) override;
-	virtual void resize(int w, int h) override;
-
-	Notifier<> selectionNotifier;
-	Notifier<> clickNotifier;
-	Notifier<> valueChangedNotifier;
+	virtual void scrollEvent(ScrollEvent *e) override;
 
-private:
 	ScrollBar scroll;
 
 	Image bg_img;