From 8f6f543758fb1b2b17ae2db519198d420eb9982d Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 14 Dec 2007 16:20:48 +0000
Subject: [PATCH] Refactor filling from Part to Alignment Implement VSlider
 Make [HV]Slider loabable from datafiles

---
 source/entry.cpp    | 13 ++-----
 source/geometry.cpp | 10 ++++++
 source/geometry.h   |  4 +--
 source/hslider.cpp  | 14 ++++----
 source/hslider.h    |  2 +-
 source/panel.cpp    |  4 +++
 source/part.cpp     | 14 +++-----
 source/part.h       |  6 +---
 source/slider.cpp   | 14 ++++++++
 source/slider.h     | 12 +++++--
 source/vslider.cpp  | 86 +++++++++++++++++++++++++++++++++++++++++++++
 source/vslider.h    | 37 +++++++++++++++++++
 12 files changed, 180 insertions(+), 36 deletions(-)
 create mode 100644 source/vslider.cpp
 create mode 100644 source/vslider.h

diff --git a/source/entry.cpp b/source/entry.cpp
index eed2c39..7e503b3 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -81,21 +81,14 @@ void Entry::render_special(const Part &part) const
 		const GL::Font *const font=style->get_font();
 		const float font_size=font->get_default_size();
 
-		const Geometry &pgeom=part.get_geometry();
-		unsigned gw=pgeom.w;
-		unsigned gh=(part.get_fill_y() ? geom.h : pgeom.h);
-
-		Geometry rgeom;
+		Geometry rgeom=part.get_geometry();
+		rgeom.x=static_cast<unsigned>(font->get_string_width(text.substr(0, edit_pos))*font_size);
 		rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-		rgeom.h=(part.get_fill_y() ? geom.h : pgeom.h);
 		part.get_alignment().apply(rgeom, geom, part.get_margin());
-		rgeom.x+=static_cast<unsigned>(font->get_string_width(text.substr(0, edit_pos))*font_size);
 
 		GL::push_matrix();
 		GL::translate(rgeom.x, rgeom.y, 0);
-
-		part.get_graphic(state)->render(gw, gh);
-
+		part.get_graphic(state)->render(part.get_geometry().w, rgeom.h);
 		GL::pop_matrix();
 	}
 }
diff --git a/source/geometry.cpp b/source/geometry.cpp
index 81efcd0..126a0fc 100644
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -36,12 +36,22 @@ Sides::Loader::Loader(Sides &s):
 
 void Alignment::apply(Geometry &geom, const Geometry &parent) const
 {
+	if(parent.w>geom.w)
+		geom.w+=static_cast<unsigned>((parent.w-geom.w)*w);
+	if(parent.h>geom.h)
+		geom.h+=static_cast<unsigned>((parent.h-geom.h)*h);
+
 	geom.x+=static_cast<int>((parent.w-geom.w)*x);
 	geom.y+=static_cast<int>((parent.h-geom.h)*y);
 }
 
 void Alignment::apply(Geometry &geom, const Geometry &parent, const Sides &margin) const
 {
+	if(parent.w>geom.w)
+		geom.w+=static_cast<unsigned>((parent.w-geom.w)*w);
+	if(parent.h>geom.h)
+		geom.h+=static_cast<unsigned>((parent.h-geom.h)*h);
+
 	geom.x+=static_cast<int>(margin.left+(parent.w-margin.left-margin.right-geom.w)*x);
 	geom.y+=static_cast<int>(margin.bottom+(parent.h-margin.bottom-margin.top-geom.h)*y);
 }
diff --git a/source/geometry.h b/source/geometry.h
index 6559414..6fa8e7f 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -56,9 +56,9 @@ Performs alignment of nested geometries, such as widgets and their parts.
 struct Alignment
 {
 	float x, y;
+	float w, h;
 
-	Alignment(): x(0), y(0) { }
-	Alignment(float x_, float y_): x(x_), y(y_) { }
+	Alignment(): x(0), y(0), w(1), h(1) { }
 	void apply(Geometry &, const Geometry &) const;
 	void apply(Geometry &, const Geometry &, const Sides &) const;
 };
diff --git a/source/hslider.cpp b/source/hslider.cpp
index d764797..3b68dac 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -59,13 +59,15 @@ void HSlider::render_special(const Part &part) const
 {
 	if(part.get_name()=="slider")
 	{
-		const Geometry &pgeom=part.get_geometry();
-		unsigned gw=pgeom.w;
-		unsigned gh=(part.get_fill_y() ? geom.h : pgeom.h);
+		Alignment align=part.get_alignment();
+		align.x=(value-min)/(max-min);
+
+		Geometry pgeom=part.get_geometry();
+		align.apply(pgeom, geom, part.get_margin());
+
 		GL::push_matrix();
-		GL::translate((geom.w-gw)*(value-min)/(max-min), (geom.h-gh)*(part.get_alignment().y+1)/2, 0);
-		const Graphic *graphic=part.get_graphic(state);
-		graphic->render(gw, gh);
+		GL::translate(pgeom.x, pgeom.y, 0);
+		part.get_graphic(state)->render(pgeom.w, pgeom.h);
 		GL::pop_matrix();
 	}
 }
diff --git a/source/hslider.h b/source/hslider.h
index 310cc4e..8f0be9f 100644
--- a/source/hslider.h
+++ b/source/hslider.h
@@ -15,7 +15,7 @@ namespace GLtk {
 
 /**
 Horizontal slider widget.  A special part named "slider" will be positioned at
-the current value of the widget.  The fill_x attribute is ignored.
+the current value of the widget.
 */
 class HSlider: public Slider
 {
diff --git a/source/panel.cpp b/source/panel.cpp
index bfd0aa8..91562ce 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -8,9 +8,11 @@ Distributed under the LGPL
 #include <msp/core/refptr.h>
 #include "button.h"
 #include "entry.h"
+#include "hslider.h"
 #include "label.h"
 #include "panel.h"
 #include "part.h"
+#include "vslider.h"
 
 using namespace std;
 
@@ -181,8 +183,10 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 {
 	add("button", &Loader::child<Button>);
 	add("entry",  &Loader::child<Entry>);
+	add("hslider", &Loader::child<HSlider>);
 	add("label",  &Loader::child<Label>);
 	add("panel",  &Loader::panel);
+	add("vslider", &Loader::child<VSlider>);
 }
 
 template<typename T>
diff --git a/source/part.cpp b/source/part.cpp
index a92e720..ec36de9 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -16,9 +16,7 @@ namespace Msp {
 namespace GLtk {
 
 Part::Part(const string &n):
-	name(n),
-	fill_x(true),
-	fill_y(true)
+	name(n)
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
 		graphic[i]=0;
@@ -38,10 +36,6 @@ void Part::render(const Geometry &parent, State state) const
 		return;
 
 	Geometry rgeom=geom;
-	if(fill_x)
-		rgeom.w=parent.w-margin.left-margin.right;
-	if(fill_y)
-		rgeom.h=parent.h-margin.bottom-margin.top;
 	align.apply(rgeom, parent, margin);
 	GL::translate(rgeom.x, rgeom.y, 0);
 	graphic[state]->render(rgeom.w, rgeom.h);
@@ -84,10 +78,10 @@ void Part::Loader::align(float x, float y)
 	part.align.y=y;
 }
 
-void Part::Loader::fill(bool x, bool y)
+void Part::Loader::fill(float w, float h)
 {
-	part.fill_x=x;
-	part.fill_y=y;
+	part.align.w=w;
+	part.align.h=h;
 }
 
 void Part::Loader::margin()
diff --git a/source/part.h b/source/part.h
index a94f29d..edc8f77 100644
--- a/source/part.h
+++ b/source/part.h
@@ -39,7 +39,7 @@ public:
 	private:
 		void graphic(State, const std::string &);
 		void align(float, float);
-		void fill(bool, bool);
+		void fill(float, float);
 		void margin();
 	};
 
@@ -49,8 +49,6 @@ private:
 	Geometry geom;
 	Sides margin;
 	Alignment align;
-	bool fill_x;
-	bool fill_y;
 
 public:
 	Part(const std::string &);
@@ -59,8 +57,6 @@ public:
 	const Geometry &get_geometry() const { return geom; }
 	const Sides &get_margin() const { return margin; }
 	const Alignment &get_alignment() const { return align; }
-	bool get_fill_x() const { return fill_x; }
-	bool get_fill_y() const { return fill_y; }
 	void render(const Geometry &, State) const;
 };
 typedef std::list<Part> PartSeq;
diff --git a/source/slider.cpp b/source/slider.cpp
index 52a4b4d..0b1d8b0 100644
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -49,5 +49,19 @@ void Slider::set_step(double s)
 	set_value(value);
 }
 
+
+Slider::Loader::Loader(Slider &s):
+	Widget::Loader(s)
+{
+	add("range", &Slider::min, &Slider::max);
+	add("step",  &Slider::step);
+	add("value", &Slider::value);
+}
+
+Slider &Slider::Loader::get_object() const
+{
+	return static_cast<Slider &>(wdg);
+}
+
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/slider.h b/source/slider.h
index 8eb3736..e6cbe0d 100644
--- a/source/slider.h
+++ b/source/slider.h
@@ -16,11 +16,19 @@ namespace GLtk {
 
 /**
 Sliders are used to adjust numeric values visually.  This class provides the
-common interface for sliders - see classes HSlider and VSlider (NYI) for
-concrete variations.
+common interface for sliders - see classes HSlider and VSlider for concrete
+variations.
 */
 class Slider: public Widget
 {
+public:
+	class Loader: public Widget::Loader
+	{
+	public:
+		Loader(Slider &);
+		Slider &get_object() const;
+	};
+
 protected:
 	double min, max;
 	double value;
diff --git a/source/vslider.cpp b/source/vslider.cpp
new file mode 100644
index 0000000..397713b
--- /dev/null
+++ b/source/vslider.cpp
@@ -0,0 +1,86 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/gl/matrix.h>
+#include <msp/gl/transform.h>
+#include "graphic.h"
+#include "part.h"
+#include "style.h"
+#include "vslider.h"
+
+namespace Msp {
+namespace GLtk {
+
+VSlider::VSlider(const Resources &r):
+	Slider(r),
+	dragging(false)
+{
+	update_style();
+}
+
+void VSlider::button_press(int x, int y, unsigned btn)
+{
+	if(geom.is_inside(x, y))
+	{
+		int sh=get_slider_height();
+		int sy=geom.y+static_cast<int>((geom.h-sh)*(value-min)/(max-min));
+		if(btn==1 && y>=sy && y<sy+sh)
+		{
+			dragging=true;
+			state=ACTIVE;
+			drag_start_y=y;
+			drag_start_value=value;
+		}
+	}
+}
+
+void VSlider::button_release(int, int, unsigned btn)
+{
+	if(btn==1)
+	{
+		dragging=false;
+		state=NORMAL;
+	}
+}
+
+void VSlider::pointer_motion(int, int y)
+{
+	if(dragging)
+	{
+		set_value(drag_start_value+(y-drag_start_y)*(max-min)/(geom.h-get_slider_height()));
+	}
+}
+
+void VSlider::render_special(const Part &part) const
+{
+	if(part.get_name()=="slider")
+	{
+		Alignment align=part.get_alignment();
+		align.y=(value-min)/(max-min);
+
+		Geometry pgeom=part.get_geometry();
+		align.apply(pgeom, geom, part.get_margin());
+
+		GL::push_matrix();
+		GL::translate(pgeom.x, pgeom.y, 0);
+		part.get_graphic(state)->render(pgeom.w, pgeom.h);
+		GL::pop_matrix();
+	}
+}
+
+unsigned VSlider::get_slider_height() const
+{
+	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
+		if(i->get_name()=="slider")
+			return i->get_geometry().h;
+
+	return 0;
+}
+
+} // namespace GLtk
+} // namespace Msp
+
diff --git a/source/vslider.h b/source/vslider.h
new file mode 100644
index 0000000..2696051
--- /dev/null
+++ b/source/vslider.h
@@ -0,0 +1,37 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#ifndef MSP_GLTK_VSLIDER_H_
+#define MSP_GLTK_VSLIDER_H_
+
+#include "slider.h"
+
+namespace Msp {
+namespace GLtk {
+
+class VSlider: public Slider
+{
+private:
+	bool dragging;
+	int drag_start_y;
+	double drag_start_value;
+
+public:
+	VSlider(const Resources &);
+	virtual void button_press(int, int, unsigned);
+	virtual void button_release(int, int, unsigned);
+	virtual void pointer_motion(int, int);
+private:
+	virtual const char *get_class() const { return "vslider"; }
+	virtual void render_special(const Part &) const;
+	unsigned get_slider_height() const;
+};
+
+} // namespace GLtk
+} // namespace Msp
+
+#endif
-- 
2.45.2