Changeset 12

Timestamp:

11/25/06 19:55:41 (2 years ago)

Author:

baxissimo

Message:

Text selection via mouse works now.

Files:

• trunk/luigi/base.d (modified) (1 diff)
• trunk/luigi/gui.d (modified) (2 diffs)
• trunk/luigi/theme.d (modified) (5 diffs)

trunk/luigi/base.d

@@ -35 +35 @@
-// Until std.math actually implements it
-long lrint(float v) {
-
++0.5
-}
-

trunk/luigi/gui.d

@@ -1512 +1512 @@
-    // mixin Signal!(Widget) text_accepted;
-
+    // This is for use by the theme
+    int xscroll_offset = 0;
+
-    //int substring_start  = 0;
-    //int substring_end  = 0;
@@ -1522 +1525 @@
-    }
-    int sel_active = 0; // 0 or 1
-
-    // This is for use by the theme
-    int xscroll_offset = 0;
-
-    invariant {

trunk/luigi/theme.d

@@ -488 +488 @@
-    void textfield_register() {
-        _addFuncs!(TextField)(&textfield_draw, &textfield_best_size, &textfield_min_size);
+        _addEvFuncs!(TextField)(&textfield_mouse_button, &textfield_mouse_move);
+    }
+    const int textfield_base_scroll = 3;
+
+    /** Returns a double indicating the position of the x value.
+        If exactly on a char boundary then the return value will be
+        integral, if right in the middle of a character it will be 
+        0.5 offset from an integer. 
+    */
+    void textfield_get_rects(TextField w, inout Rect entry, inout Rect txt)
+    {
+        entry = w.rect;
+        entry.y+=1;
+        entry.h-=2;
+        if (w.label) {
+            Rect text_rect = get_font.string_rect(w.label);
+            entry.x += 6+text_rect.w;
+            entry.w -= 6+text_rect.w;
+        }
+
+        txt = entry;
+        txt.inset(1); txt.w-=1; txt.h-=1;
+    }
+    float textfield_get_char_pos(TextField txtf, float clickx)
+    {
+        Rect entry_rect,inside_rect;
+        textfield_get_rects(txtf, entry_rect, inside_rect);
+        alias m_default_font font;
+        float offset = inside_rect.x + textfield_base_scroll + txtf.xscroll_offset;
+        float x = offset;
+        float lastx = x-10;
+        int imax = txtf.text.length;
+        // binary search would of course be better here
+        int i;
+        for(i=0; x<clickx && i<imax; x=offset+font.string_rect(txtf.text[0..++i]).w)
+        {
+            lastx = x;
+        }
+        if (i==0) return 0;
+        else if (i>=imax) return imax;
+        
+        float frac = (clickx-lastx)/(x-lastx);
+        return i-1.0+frac;
+
-    }
-    Size textfield_min_size(Widget widget, Size bounds) {
@@ -510 +554 @@
-        alias m_default_font font;
-        with (txtf) {
-
-
-
+
+
+
+
-            if (label) {
-                Rect text_rect = font.string_rect(label);
-                draw_label_text( label, 2-text_rect.x, 2-text_rect.y+text_rect.h );
-                entry_rect.x += 6+text_rect.w;
-                entry_rect.w -= 6+text_rect.w;
-            }
-
@@ -524 +567 @@
-
-            // Find where to draw the text
-            const float base_scroll = 3;
-
-            Rect inside_rect = entry_rect;
-            inside_rect.inset(1); inside_rect.w-=1;inside_rect.h-=1;
-
-            // Clip to insides of entry rect
-            push_clip_rect( inside_rect );
-
-
+textfield_
-            float sel_offset = font.string_rect(text[0..sel_begin]).width;
-            Size sel_size = font.string_rect(text[sel_begin..sel_end]).size;
@@ -541 +580 @@
-                if (sel_active==1) sel_x += sel_size.width;
-                float dx;
-
-
+
+
+
+
+
+
-            }
-
@@ -626 +669 @@
-            glEnd();
-            translate(-0.5,-0.5);
-
-
-        }
-        translate(-widget.rect.x, -widget.rect.y);
-    }
+    void textfield_mouse_button(Widget widget, MouseButtonEvent ev)
+    {
+        if (ev.is_press && ev.is_left) {
+            auto txtf = cast(TextField)widget; assert(txtf);
+            float fselpos = textfield_get_char_pos(txtf, ev.x);
+            int pos = lrint(fselpos);
+            if (ev.shift_down) {
+                int[2] sel=txtf.sel_range[];
+                sel[txtf.sel_active] = pos;
+                txtf.select_range(sel[0],sel[1]);
+            }
+            else {
+                txtf.select_range(pos,pos);       
+            }
+        }
+    }
+    void textfield_mouse_move(Widget widget, MouseMoveEvent ev) 
+    {
+        if (ev.left_down) {
+            auto txtf = cast(TextField)widget; assert(txtf);
+            float fselpos = textfield_get_char_pos(txtf, ev.x);
+            int pos = lrint(fselpos);
+            int[2] sel=txtf.sel_range[];
+            sel[txtf.sel_active] = pos;
+            txtf.select_range(sel[0],sel[1]);
+        }
+    }
+
-
-    //----SLIDER----------------------------------------------------------------