Changeset 10

Timestamp:

11/23/06 21:25:48 (2 years ago)

Author:

baxissimo

Message:

Slider kinda works now.
Have to figure out the best way to pass mouse events to the theme still, though.

Files:

• trunk/luigi/arranger.d (modified) (1 diff)
• trunk/luigi/bitmaps.d (modified) (1 diff)
• trunk/luigi/example1.brf (modified) (1 diff)
• trunk/luigi/example1.d (modified) (2 diffs)
• trunk/luigi/gldraw.d (modified) (3 diffs)
• trunk/luigi/gui.d (modified) (6 diffs)
• trunk/luigi/theme.d (modified) (4 diffs)

trunk/luigi/arranger.d

@@ -65 +65 @@
-    Size preferred_size(Size bounds);
-
+    /** Return stretch factor in x and y directions.
+     *  If component is fixed size, then should be 0.
+     *  If nonzero then all nonzero elements share the 
+     *  available space in proportion with their stretch 
+     *  factors.  So a stretch=2 gets twice as much 
+     *  space as a stretch=1.
+     */
+    int stretch_x();
+    int stretch_y();
+
-    void set_rect(Rect s);
- 
+
-    void set_size(Size sz);
-

trunk/luigi/bitmaps.d

@@ -197 +197 @@
-};
- 
-
+
+
+
-*/
-

trunk/luigi/example1.brf

@@ -1 @@
-# Damn, envvars like %DMDDIR% don't work
--g
--debug
-..\..
-..\..
+$(DMDDIR)
+$(DMDDIR)
--full
--cleanup

trunk/luigi/example1.d

@@ -60 +60 @@
-class CoolTarget(T...)
-{
-...
+
-    void slot(T args) {
-        fn(args);
-    }
-...
+
-}
-class BDelegate
@@ -194 +194 @@
-            Button b28 = arranged( g.add_widget(new Button("Tool8")));
-            Button b29 = arranged( g.add_widget(new Button("Tool9")));
+            Slider s01 = arranged( g.add_widget(new Slider("Thingy")));
+            auto T = new CoolTarget!(double)((double d){ writefln("Slider now %s",d); } );
+            s01.value_changed.fconnect!(typeof(&T.slot),1)(&T.slot);
-        }
-

trunk/luigi/gldraw.d

@@ -246 +246 @@
-{
-    r.inset(0.5);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -277 +275 @@
-{
-    r.inset(0.5);
+    
+    with(r) {
+        // inner loop
+        glBegin( GL_LINE_STRIP );
+        glColor4ubv( medium.ptr );
+        glVertex2f( x +1, y2-1 );
+        glVertex2f( x +1, y +1 );
+        glVertex2f( x2-1, y +1 );
+
+        glColor4ubv( bkg.ptr );
+        glVertex2f( x2-1, y +1 );
+        glVertex2f( x2-1, y2-1 );
+        glVertex2f( x +1, y2-1 );
+        glEnd();
+
+        // outer loop
+        glBegin( GL_LINE_STRIP );
+        glColor4ubv( dark.ptr );
+        glVertex2f( x , y2 );
+        glVertex2f( x , y  );
+        glVertex2f( x2, y  );
+
+        glColor4ubv( light.ptr );
+        glVertex2f( x2, y  );
+        glVertex2f( x2, y2 );
+        glVertex2f( x , y2 );
+        glEnd();
+    }
-//    stroke_raised_rect(r, bkg, light, medium, dark);
+/*
-    glColor3ubv(dark.ptr);
-    glBegin( GL_LINE_LOOP );
@@ -288 +315 @@
-    glVertex2f( r.x2-1, r.y2-1 );     glVertex2f( r.x+1, r.y2-1 );
-    glEnd();
-
+
-
-/*

trunk/luigi/gui.d

@@ -207 +207 @@
-    S add_widget(S)(S w)
-    {
-
+_widget
-        add(w);
-        return w;
@@ -566 +566 @@
-    }
-
+    int stretch_x() { return m_stretchx; }
+    int stretch_y() { return m_stretchy; }
+    void stretch(ubyte both)       { m_stretchx = m_stretchy = both; }
+    void stretch(ubyte x, ubyte y) { m_stretchx = x; m_stretchy = y; }
+
-    //------------------------------------------------------------------------
-    // Hooks for the theme
@@ -580 +585 @@
-    bool m_focused = false;
-    Arranger m_arranger = null;
+    ubyte m_stretchx = 0; // stretchyness for arrangement 
+    ubyte m_stretchy = 0;
-
-    // for any per-instance data needed by theme
@@ -1523 +1530 @@
-    override double value() { return m_value; }
-    override double value(double v) { 
+        if (v<m_min) v=m_min;
+        if (v>m_max) v=m_max;
-        if (v==m_value) return m_value;
-        m_value = v;
@@ -1533 +1542 @@
-        label = label_;
-        value_changed = new ValueChangedSignal;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    char[] label;
@@ -1543 +1579 @@
-private:
-    double m_value = 0;
+    double m_saveValue = 0;
+    double m_max = 100;
+    double m_min = 0;
+    double m_increment = 1;
+    double m_page = 10;
+    bool m_horizontal = true;
-}
-

trunk/luigi/theme.d

@@ -70 +70 @@
-            return null;
-        }
+        return null;
-    }    
-    void add(ClassInfo c, FuncT f) {
@@ -92 +93 @@
-        _addFuncs!(TextField)(&textfield_draw, &textfield_best_size, &textfield_min_size);
-        m_drawFuncs.add(Panel.classinfo, &panel_draw);
-//_addFuncs!(Slider)(&slider_draw, &slider_best
+_addFuncs!(Slider)(&slider_draw, &slider_best_size, &slider_min
-        //_addFuncs!(Spinner)(&spinner_draw, &spinner_best_size);
-        //_addFuncs!(RadioButton)(&radiobutton_draw, &radiobutton_best_size);
@@ -555 +556 @@
-
-    //----SLIDER----------------------------------------------------------------
-
+
+
-    Size slider_min_size(Widget widget, Size bounds) {
-        auto w = cast(Slider)widget; assert(w);
-0,0
+scroll_thumb_w+20, scroll_thumb_h+5
-    }
-    Size slider_best_size(Widget widget, Size bounds) {
-        auto w = cast(Slider)widget; assert(w);
-0,0
+100,scroll_thumb_h+5
-    }
-    void slider_draw(Widget widget) {
@@ -568 +570 @@
-        set_color(get_background_color(widget));
-        fill_rect(w.rect);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    //----SPINNER----------------------------------------------------------------
-    /*