Changeset 32

Timestamp:

12/03/06 20:43:32 (2 years ago)

Author:

baxissimo

Message:

Added an implementation of exclusive toggle behavior in the form of RadioGroup?.
Needs to be made more robust with regard to attachments and detachments. Also it only works with Button-derived things. Would be nice if say, any Valuator could be used, but the Valuator interface doesn't have a hook for setting a callback.

In general the approach taken by RadioGroup? is to connect a bunch of signals up so that exclusivity is maintained. So everything relies on the RadioGroup? itself. An alternate approach is to put smarts into the Buttons. Have them be observers of the RadioGroup? rather than other way around. It makes heterogeneity easier (anything can observe and set the radiogroups value) But then the buttons need to have ID's and I really dislike that style.

I guess with things the way they are now, you actually _could_ do approach #2 if you have items that know their own ID.

Files:

• trunk/luigi/adapter.d (modified) (1 diff)
• trunk/luigi/base.d (modified) (14 diffs)
• trunk/luigi/example1.d (modified) (4 diffs)
• trunk/luigi/example1_gld.d (modified) (3 diffs)
• trunk/luigi/gui.d (modified) (12 diffs)
• trunk/luigi/themes/std.d (modified) (3 diffs)

trunk/luigi/adapter.d

@@ -48 +48 @@
-    To implement a new adapter, derive from the InputAdapter interface, and mixin the 
-    InputAdapterMix.  This sets up the external interface and the signals.
-    Now all you have to do is 
- */
-interface InputAdapter

trunk/luigi/base.d

@@ -73 +73 @@
-
-    /** Rect constructor */
- = 0, float rh
-; r.h = rh
+idth = 0, float rheight
+idth; r.h = rheight
-        return r;
-    }
-Value setter
-rx, float ry, float rw, float rh
-rx; y = ry; w = rw; h = rh
-
-Value setter using point values
+Set value using left,top,width,height convention
+xpos, float ypos, float rwidth, float rheight
+xpos; y = ypos; w = rwidth; h = rheight
+
+Set value using left,top,right,bottom convention
-    void  setLTRB(float leftx, float topy, float rightx, float bottomy) {
-        set(leftx,topy,rightx-leftx,bottomy-topy);
@@ -128 +128 @@
-
-/** Size is used to describe the width and height of a box.
-
-
-
+
+
+
+
- */
-struct Size
@@ -141 +142 @@
-    alias height h;
-
+    /** Constructor */
-    static Size opCall(float _w, float _h) {
-        Size s; s.width = _w;  s.height = _h; return s;
-    }
-
+    /** Allows Sizes to be added to using s1 += s2. */
-    void opAddAssign(Size o) { w+=o.w; h+=o.h; }
+
+    /** Allows Sizes to be subtracted from using s1 += s2. */
-    void opSubAssign(Size o) { w-=o.w; h-=o.h; }
-
+    /** Return a printable representation of the Size */
-    char[] toString() {
-        return string.format("(%0.1f,%0.1f)",w,h);
@@ -153 +159 @@
-}
-
+/** Point can be used as an alias for Size.  
+    This is not a typedef so there is no compiler enforcement of the distinction,
+    but you can use Point vs Size as the situation dictates to indicate the
+    intent of the variable, be it a location or a displacement.
+ */
-alias Size Point;
-
-
+/** Color represents a standard 4-byte RGBA color value.
+    It is the type used to represent colors througout Luigi.
+    Color components can be accessed via .r, .g, .b, and .a properties.
+    Alternatively, one can use numerical indexing, e.g. c[0],c[1],c[2],c[3].
+ */
-struct Color
-{
@@ -165 +181 @@
-    }
-
+    /** Constructor using integral values in the range 0--255 */
-    static Color opCall(int r_, int g_, int b_, int a_=255) {
-        Color c; c.set(r_,g_,b_,a_); return c;
-    }
+    /** Constructor using floating point  values in the range 0.0--1.0 */
-    static Color opCall(float r_, float g_, float b_, float a_=1.0) {
-        Color c; c.set(r_,g_,b_,a_); return c;
-    }
-
+    /** Setter using integral values in the range 0--255 */
-    void set(int r_, int g_, int b_, int a_=255) {
-        r=r_, g=g_, b=b_, a=a_;
-    }
-
+    /** Setter using floating point  values in the range 0.0--1.0 */
-    void set(float r_, float g_, float b_, float a_=1.0) {
-        r=lrint(r_*255), g=lrint(g_*255), b=lrint(b_*255), a=lrint(a_*255);
-    }
-
+    /** Linearly interpolate between the two colors.
+        Params:
+            c1 = the first color 
+            c2 = the second color
+            t  = the interpolation parameter between 0 and 1
+        Returns: the blended color 
+                 If t==0 then the result is c1
+                 If t==1 then the result is c2
+    */
-    static Color lerp(Color c1, Color c2, float t) {
-        Color ret;
@@ -189 +218 @@
-    }
-
+    /** Allows a color to be indexed with brackets [].
+        R,G,B,A components correspond to indexes 0,1,2,3.
+     */
-    ubyte opIndex(int i) { return v[i]; }
-    ubyte opIndexAssign(int i, ubyte val) { return v[i]=val; }
-
+    /** Return a pointer to the beginning of the 4 bytes that
+     *  make up this color.  Bytes are ordered R,G,B,A.
+     */
-    ubyte* ptr() { return &r; }
-}
@@ -202 +237 @@
- * the sizes are identical.  If either type is an object then both must
- * be objects of either the same type or where one is a base class of
-
+  Used by min() and max() templates.
- */
-template largestOrConvertible( T, U )
@@ -224 +259 @@
-}
-
+/** Returns the maximum of two values */
-template max( T, U )
-{
@@ -231 +267 @@
-    }
-}
+
+/** Returns the minimum of two values */
-template min( T, U )
-{
@@ -308 +346 @@
-
-/**
-  More performant than
+
- *  (modified from Cashew.utils)
- */
@@ -326 +364 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-template drop_range(T)
-{
@@ -349 +389 @@
-/***********************************************************************************
- * Lookup the index of the first element of an array that satisfies a delegate.
+ * Returns: the index of the value or NOT_FOUND if not found.
- */
-size_t find (T) (T[] haystack, bool delegate (T) dg)
@@ -369 +410 @@
-/***********************************************************************************
- * Lookup the index of the first element of an array that equals a given value
+ * Returns: the index of the value or NOT_FOUND if not found.
- */
-size_t find_item (T) (T[] haystack, T cmp)
@@ -388 +430 @@
-
-/***********************************************************************************
-See if
+Return whether
- */
-bool contains(T) (T[] haystack, T cmp)

trunk/luigi/example1.d

@@ -73 +73 @@
-        gui = new Overlay;
-    
-        //gui.arranger = new FlowArranger(Alignment.Left|Alignment.Bottom);
-        //gui.arranger = new GridArranger(2,2);
-        //BorderArranger layout = new BorderArranger(5,5);
-        gui.arranger = new BorderArranger(Gaps(5));
-
@@ -86 +83 @@
-        auto southGroup = gui.add_arranged(new FlowPanel, Region.South);
-
+        auto rgrp = new RadioGroup;
+
+        with (westGroup) {
+            auto b20 = add_arranged(new Button("Tool0"));
+            auto b21 = add_arranged(new Button("Tool1"));
+            auto b22 = add_arranged(new Button("Tool2"));
+            auto b23 = add_arranged(new Button("Tool3"));
+            auto b24 = add_arranged(new Button("LongNameTool4"));
+            auto b25 = add_arranged(new Button("Tool5"));
+            auto b26 = add_arranged(new Button("Tool6"));
+            auto b27 = add_arranged(new Button("Tool7"));
+            auto b28 = add_arranged(new Button("Tool8"));
+            auto b29 = add_arranged(new Button("Tool9"));
+
+            rgrp.add(b20,b21,b22,b23,b24,b25,b26,b27,b28,b29);
+            rgrp.value = 0;
+            rgrp.selection_changed ~= (int t) {
+                writefln("Tool %s now selected", t);
+            };
+
+            auto s01 = add_arranged(new Slider("Thingy"));
+            auto s02 = add_arranged(new Slider("Thingy"));
+            s02.vertical = true;
+            s01.precision = 0.1;
+            s02.precision = 0.1;
+
+            s01.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } );
+            s02.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } );
+            s02.value_changed.connect2nd(&s01.value);
+            s01.value_changed.connect2nd(&s02.value);
+        }
+
-        with(eastGroup) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                Button b = cast(Button)w; assert(b);
-                if (v) b.label = "Show West";
@@ -104 +131 @@
-        }
-
+        with(southGroup) {
+            auto l0 = add_widget(new Label( "First Name:"));
+            auto t0 = add_widget(new TextField("Hello"));
+            auto l1 = add_widget(new Label( "Last Name:"));
+            auto t1 = add_widget(new TextField("Rumpelstiltskin"));
+            auto b4 = add_widget(new Button("Click me!"));
+            auto l2 = add_widget(new Label("Disabled label"));
+            l2.disable;
+            b4.clicked ~= (Widget w){ writefln("Ouch! Not so hard!"); };
+        }
+
-        with (northGroup) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-            c15.value_changed ~= (Widget w, bool onoff) {
@@ -119 +156 @@
-            };
-        }
-
-        with(southGroup) {
-            alias southGroup g; // workaround for http://tinyurl.com/u5eal
-            //Button b0 = add_widget(new Button("Hohoho!"));
-            auto l0 = g.add_widget(new Label( "First Name:"));
-            auto t0 = g.add_widget(new TextField("Hello"));
-            auto l1 = g.add_widget(new Label( "Last Name:"));
-            auto t1 = g.add_widget(new TextField("Rumpelstiltskin"));
-            auto b4 = g.add_widget(new Button("Click me!"));
-            auto l2 = g.add_widget(new Label("Disabled label"));
-            l2.disable;
-            b4.clicked ~= (Widget w){ writefln("Ouch! Not so hard!"); };
-        }
-
-        with (westGroup) {
-            alias westGroup g; // workaround for http://tinyurl.com/u5eal
-            auto b20 = g.add_arranged(new Button("Tool0"));
-            auto b21 = g.add_arranged(new Button("Tool1"));
-            auto b22 = g.add_arranged(new Button("Tool2"));
-            auto b23 = g.add_arranged(new Button("Tool3"));
-            auto b24 = g.add_arranged(new Button("LongNameTool4"));
-            auto b25 = g.add_arranged(new Button("Tool5"));
-            auto b26 = g.add_arranged(new Button("Tool6"));
-            auto b27 = g.add_arranged(new Button("Tool7"));
-            auto b28 = g.add_arranged(new Button("Tool8"));
-            auto b29 = g.add_arranged(new Button("Tool9"));
-            auto s01 = g.add_arranged(new Slider("Thingy"));
-            auto s02 = g.add_arranged(new Slider("Thingy"));
-            s02.vertical = true;
-            s01.precision = 0.1;
-            s02.precision = 0.1;
-
-            s01.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } );
-            s02.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } );
-            s02.value_changed.connect2nd(&s01.value);
-            s01.value_changed.connect2nd(&s02.value);
-        }
-
-/*
-       // This is my ideal version, but it requires more smarts from D
-        Button b3 = gui.add_widget(new Button("Mate!")).arranged(Region.East);
-*/
-    }
-    return gui;

trunk/luigi/example1_gld.d

@@ -67 +67 @@
-}
-
-
-luigui.Overlay create_gui(char[] theme)
-{
@@ -88 +87 @@
-        auto southGroup = gui.add_arranged(new FlowPanel, Region.South);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            s02.vertical = true;
-            s01.precision = 0.1;
@@ -151 +117 @@
-            s02.value_changed.connect2nd(&s01.value);
-            s01.value_changed.connect2nd(&s02.value);
+        }
+
+        with(eastGroup) {
+            auto b0 = add_widget(new Button("Luigi"));  b0.disable();
+            auto b1 = add_widget(new Button("Is")); rgrp.add(b1,5);
+            auto b2 = add_widget(new Button("My")); rgrp.add(b2,7);
+            auto b3 = add_widget(new Button("Pal"));rgrp.add(b3,9);
+            auto b4 = add_widget(new Button("Hide West")); 
+            b4.is_toggle = true;
+            b4.clicked.connect( &westGroup.toggle_shown );
+            b4.value_changed ~= (Widget w, bool v){
+                Button b = cast(Button)w; assert(b);
+                if (v) b.label = "Show West";
+                else   b.label = "Hide West";
+                b.get_root.arrange();
+            };
+        }
+
+        with(southGroup) {
+            auto l0 = add_widget(new Label( "First Name:"));
+            auto t0 = add_widget(new TextField("Hello"));
+            auto l1 = add_widget(new Label( "Last Name:"));
+            auto t1 = add_widget(new TextField("Rumpelstiltskin"));
+            auto b4 = add_widget(new Button("Click me!"));
+            auto l2 = add_widget(new Label("Disabled label"));
+            l2.disable;
+            b4.clicked ~= (Widget w){ writefln("Ouch! Not so hard!"); };
+        }
+
+        with (northGroup) {
+            auto b10 =   add_widget(new Button("File"));
+            auto b11 =   add_widget(new Button("Edit"));
+            auto b12 =   add_widget(new Button("View"));
+            auto b13 =   add_widget(new Button("Favorites"));
+            auto b14 =   add_widget(new Button("Tools"));
+            auto b15 =   add_widget(new Button("Options"));
+            auto c15 =   add_widget(new Checkbox("Check it out!"));
+            auto b16 =   add_widget(new Button("Help"));
+
+            c15.value_changed ~= (Widget w, bool onoff) {
+                writefln(onoff?"checked!":"unchecked!"); 
+            };
-        }
-    }

trunk/luigi/gui.d

@@ -2 +2 @@
-/**
-   Luigi is an OpenGL based GUI library.
+   
+   The goal is to provide a simple but flexible way to add a simple
+   GUI to an OpenGL program.
+
+   Luigi supports themes and input adaptors.  Themes give you a way
+   to customize the look of GUI.  Input adaptors do the work of
+   taking events from the OS or from a windowing toolkit like GLD, and
+   turning them into something Luigi can use.
-*/ 
-//---------------------------------------------------------------------
-/*
- Copyright:
-
-  luigi/gui.d -- main import file for 'luigi' user interface library.
-1, November 9
+5, December 3
-
-  Copyright (C) 2006 William V. Baxter III
@@ -31 +37 @@
-  William Baxter wbaxter@gmail.com
-*/
-
+
-/*
-
-
+
+
+
+
-  I.e.
-
@@ -43 +51 @@
-          int value()
-
- will connect to the getter rather 
-
+(value) will silently connect to the
+getter rather 
- */
-
@@ -79 +87 @@
-class Luigi
-{
- Singleton access
+/ Return the singleton instance
-    static Luigi opCall() {
-        static Luigi instance = null;
@@ -85 +93 @@
-        return instance;
-    }
+
+    /// Return the singleton instance
-    static Luigi inst() {
-        return Luigi();
-    }
-
+    /// Set the theme
-    Theme theme(Theme th) { return m_theme=th; }
+    /// Get the current theme
-    Theme theme() { 
-        if (!m_theme) {
@@ -97 +109 @@
-    }
-
+    /** Add a top level overlay.  
+        This is called automatically by Overlay, so typically there is no 
+        reason for users to call it themselves.
+    */
-    void add_overlay(Overlay ov) {
-        m_guis ~= ov;
@@ -115 +131 @@
-    }
-
+    /** Returns the size of the specified window */
-    Size get_window_size(WindowHandle win) {
-        return m_inputsys.get_window_size(win);
-    }
-
+    /** Set the current input adapter */
-    void adapter(InputAdapter inputsys) {
-        m_inputsys = inputsys;
-    }
+    /** Get the current input adapter */
+    InputAdapter adapter() {
+        return m_inputsys;
+    }
-
-private:
@@ -129 +151 @@
-
-    ~this() {
-
-    }
-
@@ -135 +156 @@
-    InputAdapter m_inputsys;
-    Theme m_theme;
-}
-
-
-/** arranged() adds the specified widget to its parent's arranger
- */
-T arranged(T, VArg...)(T widget, VArg varg)
-{
-    static assert(is(T:Widget), "arranger_add requires a Widget as argument 0");
-    assert(widget.parent, "arranged called on widget with no parent");
-    assert(widget.parent.arranger, "arranged called on widget with parent.arranger");
-    // Not really necessary to use the fancy DMD 0.173 feature here
-    // but I might as well.  A classic '...'/valist would have worked, but
-    // I hate looking at _argptrs and _arguments.
-    if (widget.parent && widget.parent.arranger && !widget.parent.arranger.auto_add) {
-        widget.parent.arranger.add(widget, varg);
-    }
-    return widget;
-}
-
@@ -204 +208 @@
-    static assert(is(T:Panel), "PanelMixin should be derived from Panel");
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    W add_widget(W)(W widget)
-    {
@@ -213 +225 @@
-        return widget;
-    }
+
+    /** Add the widget to this panel and also to the panel's arranger
+     *  with arguments.
+     *
+     * This method returns the widget passed in with its full derived type,
+     * so add_arranged can be used like:
+     * ---------
+     *   auto b = border_panel.add_arranged(new Button("Clicky"), Region.East);
+     * ---------
+     * and the resulting b will have type Button.
+     *
+     * See_Also: add_widget, Panel.add, Arranger.add
+     */
-    W add_arranged(W, Varg...)(W widget, Varg args)
-    {
@@ -1651 +1676 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    override double value() { return m_checkedItem; }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-private:
-
-
+
+
+
+
+
-
-

trunk/luigi/themes/std.d

@@ -46 +46 @@
-        panel_register();
-        spinner_register();
-radiogroup_register();
+/*radiogroup_register();*/
-        radiobutton_register();
-
@@ -709 +709 @@
-    */
-    //----RADIOGROUP----------------------------------------------------------------
+/*
-    void radiogroup_register() {
-        //addHandlers!(RadioGroup)(&radiogroup_draw, &radiogroup_best_size);
@@ -725 +726 @@
-        fill_rect(w.rect);
-    }
+*/
-    //----RADIOBUTTON----------------------------------------------------------------
-    void radiobutton_register() {