Changeset 43:1530d9c04d4d

Timestamp:

05/15/08 05:39:57 (8 months ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

branch:

default

convert_revision:

3f46d85fe9161935762020890cfc39ce37d3e422

Message:

Column/row resizing implemented for GridLayoutWidget? (finally)!

Also new exitImmediately option and a few debug scope(failure) log messages.

committer: Diggory Hardy <diggory.hardy@gmail.com>

Files:

• codeDoc/ideas.txt (added)
• codeDoc/jobs.txt (modified) (4 diffs)
• data/L10n/OptionsMisc.mtt (modified) (1 diff)
• data/conf/gui.mtt (modified) (1 diff)
• data/conf/options.mtt (modified) (1 diff)
• mde/Options.d (modified) (1 diff)
• mde/gui/Gui.d (modified) (2 diffs)
• mde/gui/renderer/IRenderer.d (modified) (1 diff)
• mde/gui/renderer/SimpleRenderer.d (modified) (1 diff)
• mde/gui/widget/Widget.d (modified) (3 diffs)
• mde/gui/widget/layout.d (modified) (16 diffs)
• mde/mde.d (modified) (1 diff)
• mde/scheduler/Init.d (modified) (1 diff)

codeDoc/jobs.txt

@@ -4 +4 @@
-
-In progress:
-Implement row/col sizing.
-
-
@@ -10 +9 @@
-To do (importance 0-5: 0 pointless, 1 no obvious impact now, 2 todo sometime, 3 useful, 4 important, 5 urgent):
-Also see todo.txt and FIXME/NOTE comment marks.
+4   Not guaranteed to catch up-click ending callback! Appears not to be a problem...
-4   OutOfMemoryException is not currently checked for − it should be at least in critical places (use high-level catching of all errors?).
-3   on-event draw support (mde.events and GUI need to tell mde.mde)
@@ -15 +15 @@
-3   Update scheduler as outlined in FIXME.
-3   Windows building/compatibility (currently partial)
+2   Options need a "level": simple options, for advanced users, for debugging only, etc.
-2   Command-line options for paths to by-pass normal path finding functionality.
-2   Consider replacing byte/short types with int type
@@ -50 +51 @@
-
-Done (for git log message):
-The renderer now controls which parts of the window border allow resizing.

data/L10n/OptionsMisc.mtt

@@ -4 +4 @@
-<entry|logLevel=["Logging level","Controls which messages are logged, from 0=trace to 6=none (default: 1=info)."]>
-<entry|L10n=["Localisation","Specifies the language to use."]>
+<entry|pollInterval=["Polling interval","Delay in main loop to limit CPU usage"]>
+<entry|exitImmediately=["Exit immediately","Load files and exit immediately, without running main loop (for debugging)"]>

data/conf/gui.mtt

@@ -4 +4 @@
-<int|x=30>
-<int|y=80>
-4010,200,2
+B004,2,1,1,2],1:[0x4010,200,200],2:[0x1,100,1
-{W2}
-<int|x=150>

data/conf/options.mtt

@@ -2 +2 @@
-{misc}
-<bool|useThreads=false>
+<bool|exitImmediately=false>
-<char[]|L10n="en-GB">
-0
+1
-<double|pollInterval=0.01>
-

mde/Options.d

@@ -342 +342 @@
-OptionsMisc miscOpts;
-class OptionsMisc : Options {
-
+, "exitImmediately"
-    alias store!("logLevel") INT;
-    alias store!("pollInterval") DOUBLE;

mde/gui/Gui.d

@@ -146 +146 @@
-    * Sends the event on to the relevant windows and all click callbacks. */
-    void clickEvent (ushort cx, ushort cy, ubyte b, bool state) {
+        debug scope (failure)
+                logger.warn ("clickEvent: failed!");
-        // NOTE: buttons receive the up-event even when drag-callbacks are in place.
-        foreach (dg; clickCallbacks)
@@ -166 +168 @@
-    * Sends the event on to all motion callbacks. */
-    void motionEvent (ushort cx, ushort cy) {
+        debug scope (failure)
+                logger.warn ("motionEvent: failed!");
-        foreach (dg; motionCallbacks)
-            dg (cx, cy);

mde/gui/renderer/IRenderer.d

@@ -75 +75 @@
-    void drawWidgetBack (int x, int y, int w, int h);
-    
+    /** Draws a blank widget (temporary) */
+    void drawBlank (int x, int y, int w, int h);
+    
-    /** Draws a button frame, in if pushed == true. */
-    void drawButton (int x, int y, int w, int h, bool pushed);

mde/gui/renderer/SimpleRenderer.d

@@ -94 +94 @@
-    void drawWidgetBack (int x, int y, int w, int h) {}
-    
+    void drawBlank (int x, int y, int w, int h) {
+        gl.setColor (.4f, .4f, .4f);
+        gl.drawBox (x,y, w,h);
+    }
+    
-    void drawButton (int x, int y, int w, int h, bool pushed) {
-        if (pushed)

mde/gui/widget/Widget.d

@@ -129 +129 @@
-        h = (nh >= 0 ? nh : 0);
-    }
+    
+    void draw () {
+        super.draw;
+        
+        window.renderer.drawBlank (x,y, w,h);
+    }
-}
-
@@ -138 +144 @@
-        if (data.length != 3) throw new WidgetDataException;
-        super (wind, data);
+    }
+    void draw () {
+        super.draw;
+        
+        window.renderer.drawBlank (x,y, w,h);
-    }
-}
@@ -176 +187 @@
-    // Called when a mouse motion/click event occurs while (held == true)
-    bool clickWhileHeld (ushort cx, ushort cy, ubyte b, bool state) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        return false;
-    }

mde/gui/widget/layout.d

@@ -19 +19 @@
-import mde.gui.widget.Widget;
-import mde.gui.exception;
+
+import tango.io.Stdout;
+debug {
+    import tango.util.log.Log : Log, Logger;
+    private Logger logger;
+    static this () {
+        logger = Log.getLogger ("mde.gui.widget.layout");
+    }
+}
-
-/** Encapsulates a grid of Widgets.
@@ -59 +68 @@
-            data = widget.adjust (data);
-        
-        // colWMin/rowHMin are needed as absolute quantities in this function:
-        int[] cwMin = new int[colWMin.length];
-        foreach (i,x; colWMin)
-            cwMin[i] = x>=0 ? x : -x;
-        int[] rhMin = new int[rowHMin.length];
-        foreach (i,x; rowHMin)
-            rhMin[i] = x>=0 ? x : -x;
-        
-        /* We basically short-cut setSize by loading previous col/row sizes and doing the final
-         * calculations.
@@ -74 +75 @@
-        int lenUsed = 0;
-        if (data.length < rows + cols) {    // data error; use defaults
-wMin
-hMin
+olWMin.dup
+owHMin.dup
-        } else {                            // sufficient data
-            lenUsed = rows+cols;
@@ -85 +86 @@
-            //NOTE: could also check non-resizable sizes are not too large
-            foreach (i, ref w; colW)
-wMin[i]) w = cw
+olWMin[i]) w = colW
-            foreach (i, ref h; rowH)
-hMin[i]) h = rh
+owHMin[i]) h = rowH
-        }
-        
@@ -118 +119 @@
-    
-    bool isWSizable () {
-
-
-
-
-
+
-    }
-    
-    bool isHSizable () {
-
-
-
-
+
-    }
-    
@@ -140 +134 @@
-    void setSize (int nw, int nh) {
-        // Step 1: calculate the row/column sizes.
-
-
-
-
+sizableCols, 
+sizableRows, 
+
+'
-        genCachedMutableData;
-        
@@ -166 +160 @@
-        int i = cols - 1;                   // starting from right...
-        while (lx < colX[i]) {              // decrement while left of this column
-
+debug 
-            --i;
-        }                                   // now (lx >= colX[i])
@@ -174 +168 @@
-        int j = rows - 1;
-        while (ly < rowY[j]) {
-
+debug 
-            --j;
-        }
@@ -191 +185 @@
-    // Resizing columns & rows
-    void clickEvent (ushort cx, ushort cy, ubyte b, bool state) {
+        debug scope (failure)
+                logger.warn ("clickEvent: failure");
-        if (b == 1 && state == true) {
-
+
+
+
-            
-            // Find the column
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-            // Find the row
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
+
+
+
-            
-            dragX = cx;
@@ -261 +286 @@
-        
-        // Find which cols/rows are resizable:
+        sizableCols = sizableRows = null;   // reset; we're about to concatenate to them
+        
-        forCols:
-        for (uint i = 0; i < cols; ++i) {                       // for each column
-            for (uint j = 0; j < subWidgets.length; j += cols)  // for each row
-
-
+
-                    continue forCols;                   // continue the outer for loop
-                }
-                
-            // column is resizable if we get to here
-// entry is left positive, meaning it is resizable
+sizableCols ~= i;
-        }
-        
@@ -276 +301 @@
-        for (uint i = 0; i < subWidgets.length; i += cols) {    // for each row
-            for (uint j = 0; j < cols; ++j)                     // for each column
-
-
-
+
-                    continue forRows;
-
+
+
-        }
-    }
@@ -315 +339 @@
-     *  cellD       = current sizes; is adjusted by the function to new sizes
-     *  cellDMin    = minimal sizes (see colWMin/rowHMin)
+     *  sizableCells= List of indexes in cellD for cells which are resizable
-     *  diff        = amount to increase/decrease the total size
-     *  startHigh   = if true, start resizing from the tail end of cellD, instead of the beginning
@@ -321 +346 @@
-     *  The amount adjusted. This may be larger than diff, since cellD is clamped by cellDMin.
-     */
-
+ref size_t[] sizableCells, 
-    in {// Could occur if adjust isn't called first, but this would be a code error:
-        assert (cellD !is null, "adjustCellSizes: cellD is null");
-    } body {
-
-
+
+
+
+
-        
-        // FIXME: could do with an overhaul
-        if (diff > 0) {         // increase size of first resizable cell
-
-
-
-
-
-
-
-
-
+
-            return diff;
-        }
-        else if (diff < 0) {    // decrease
+            size_t sc = (startHigh ? -1 : 1);   // amount to iterate
+            size_t ci;          // index in cellD
-            int rd = diff;      // running diff
-            while (true) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -369 +389 @@
-        int move;           // NOTE: all resizing is relative, unlike in Window
-        
- >
+sL.length !
-            move = cx - dragX;
-            int[] d0 = colW[0..resizeCol];
-            int[] d1 = colW[resizeCol..$];
-            int[] m0 = colWMin[0..resizeCol];
-            int[] m1 = colWMin[resizeCol..$];
-            
-            // do shrinking first (in case we hit the minimum)
-            // Note: we rely on x[a..b] pointing to the same memory as x
->
-d1, m1, -
-d0, m0
+<
+colW, colWMin, resizeColsL, 
+colW, colWMin, resizeColsH
-            } else {
-d0, m0, 
-d1, m1
+colW, colWMin, resizeColsH, -
+colW, colWMin, resizeColsL
-            }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        window.requestRedraw;
-    }
@@ -393 +429 @@
-        if (b == 1 && state == false) {
-            window.gui.removeCallbacks (cast(void*) this);
+            // Remove unwanted data (although it shouldn't free any memory):
+            resizeColsL = resizeColsH = resizeRowsL = resizeRowsH = null;
-            return true;    // we've handled the up-click
-        }
@@ -400 +438 @@
-protected:
-    // Data for resizing cols/rows:
-    int resizeCol = -1, // col/row being resized;
-        resizeRow = -1; // negative if none
-    int dragX, dragY;   // coords where drag starts
+    // Lists of columns/rows with lower/higher index than the resize position
+    size_t[] resizeColsL, resizeColsH, resizeRowsL, resizeRowsH;
-    //END Col/row resizing
-    
-
+
+
-    int cols, rows;     // number of cells in grid
-
-
-
+
+
+
+
-    
-    // Cached data calculated from construction data:
-int[] colWMin;      // absolute value is minimal column width / row height
-rowHMin;      // negative if fixed size, entry >= 0 if resizible
+// Minimal column width / row height:
+colWMin, rowHMin;
-    int mw, mh;         // minimal dimensions
-    
-
-
-
+
+
+
+
+
+
+
-    
-    // Cached data calculated from construction and mutable data:
-;      
-int[] rowY;         // cumulative rowH[i-1] + padding
+, rowY;
+//END Mutable data
-}

mde/mde.d

@@ -55 +55 @@
-    }
-    
-0.1
-
+1.0
+1
-    //END Initialisation
-    

mde/scheduler/Init.d

@@ -140 +140 @@
-        }
-        
-
-
+
+
+
+
-        //END Pre-init
-