Implement mouse wheel scrolling in List

[libs/gltk.git] / source / geometry.cpp

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 5c304d389a631eab7c63c905b28425bcaaa7c5da..0cb78ffcc392d636a45a7e7469d4ea5690601bbb 100644 (file)
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "geometry.h"
 
 namespace Msp {
@@ -28,16 +21,58 @@ Sides::Sides():
        left(0)
 { }
 
+Sides::Sides(unsigned s):
+       top(s),
+       right(s),
+       bottom(s),
+       left(s)
+{ }
+
+Sides::Sides(unsigned v, unsigned h):
+       top(v),
+       right(h),
+       bottom(v),
+       left(h)
+{ }
+
+Sides::Sides(unsigned t, unsigned h, unsigned b):
+       top(t),
+       right(h),
+       bottom(b),
+       left(h)
+{ }
+
+Sides::Sides(unsigned t, unsigned r, unsigned b, unsigned l):
+       top(t),
+       right(r),
+       bottom(b),
+       left(l)
+{ }
+
 
 Sides::Loader::Loader(Sides &s):
        DataFile::ObjectLoader<Sides>(s)
 {
+       add("horizontal", &Loader::horizontal);
+       add("vertical",   &Loader::vertical);
        add("top",    &Sides::top);
        add("right",  &Sides::right);
        add("bottom", &Sides::bottom);
        add("left",   &Sides::left);
 }
 
+void Sides::Loader::horizontal(unsigned h)
+{
+       obj.right = h;
+       obj.left = h;
+}
+
+void Sides::Loader::vertical(unsigned v)
+{
+       obj.top = v;
+       obj.bottom = v;
+}
+
 
 void Alignment::apply(Geometry &geom, const Geometry &parent) const
 {
@@ -55,22 +90,14 @@ void Alignment::apply(Geometry &geom, const Geometry &parent) const
 
 void Alignment::apply(Geometry &geom, const Geometry &parent, const Sides &margin) const
 {
-       unsigned pw = parent.w-margin.left-margin.right;
-       unsigned ph = parent.h-margin.bottom-margin.top;
+       Geometry content = parent;
+       content.w -= margin.left+margin.right;
+       content.h -= margin.bottom+margin.top;
 
        geom.x += margin.left;
        geom.y += margin.bottom;
 
-       if(pw>geom.w)
-       {
-               geom.w += static_cast<unsigned>((pw-geom.w)*w);
-               geom.x += static_cast<int>((pw-geom.w)*x);
-       }
-       if(ph>geom.h)
-       {
-               geom.h += static_cast<unsigned>((ph-geom.h)*h);
-               geom.y += static_cast<int>((ph-geom.h)*y);
-       }
+       apply(geom, content);
 }
 
 } // namespace GLtk