Changeset 179:1f9d00f392bd

Timestamp:

09/15/09 14:09:59 (3 years ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

Tags:

tip

branch:

default

Message:

Fixed a bug where (non-resizible) widgets wouldn't get shrunk when minimal size decreases, meaning optional context menus are hiden properly now.
Optimised when ServiceContentList?.opCall is called, I think without breaking anything.

Files:

• codeDoc/jobs.txt (modified) (2 diffs)
• mde/content/Content.d (modified) (1 diff)
• mde/content/ServiceContent.d (modified) (9 diffs)
• mde/gui/widget/AParentWidget.d (modified) (1 diff)
• mde/gui/widget/Ifaces.d (modified) (1 diff)
• mde/gui/widget/ParentContent.d (modified) (5 diffs)
• mde/gui/widget/WidgetManager.d (modified) (7 diffs)
• mde/gui/widget/layout.d (modified) (8 diffs)

codeDoc/jobs.txt

@@ -4 +4 @@
-
-In progress:
-
+
+
-Having setContent recusively call on subWidgets is not quite right: where the addContent function was used to pass a different content, the content should not be reset by a content() call propegated from a parent.
-Why is ServiceContent.opCall() called in addition to call from CollapsibleWidget?
-Why is ServiceContentList.opCall() not called? Probably because it's callbacks are never called.
-
-
@@ -13 +12 @@
-To do (importance 0-5: 0 pointless, 1 no obvious impact now, 2 todo sometime, 3 useful, 4 important, 5 urgent):
-Also search for FIXME/NOTE/BUG/WARNING comment marks.
+5   Context menu callbacks (actions) sometimes are sometimes called when opening the context menu.
-4   Move createWidget code out of WidgetManager.
+4   Make GridLayoutWidget decrease size when no cols/rows are resizable and min-size reduces (to make optional context menu items disappear completely when not available).
-3   Make clickEvent only for down-clicks?
-3   RequestRedraw should become a function of the renderer.

mde/content/Content.d

@@ -127 +127 @@
-     * --- */
-    final void endEvent () {
-
+
+
-        dg (this);
+    }
-    }
-    

mde/content/ServiceContent.d

@@ -34 +34 @@
-}
-
-
+
+
+
+
+
+
+
-interface IServiceContent : IContent {
-    void setContent (Content cont);
@@ -57 +63 @@
-    T oCont = activeCont;
-    activeCont = cast(T)cont;
-
+
+
-        endEvent;
+        logger.trace ("01");
+    }
-    }
-    
@@ -81 +90 @@
-    this (char[] symbol) {
-    super (symbol);
+    foreach (child; list_) {
+        if ((cast(IBoolContent)child)()) {
+        v = true;
+        break;
+        }
+    }
+    endEvent;
-    }
-    
@@ -87 +103 @@
-        (cast(IServiceContent)child).setContent (cont);
-    }
+    bool ov = v;
+    v = false;
+    foreach (child; list_) {
+        if ((cast(IBoolContent)child)()) {
+        v = true;
+        break;
+        }
+    }
+    if (v != ov) {
+        debug logger.trace ("ServiceContentList.endEvent");
+        endEvent;
+    }
-    }
-    
@@ -92 +120 @@
-    assert (cast(IBoolContent) x, "Only IBoolContent children are allowed!");
-    list_ ~= x;
-
+
+
-    }
-    
-    override bool opCall () {
-"
+: {}", symbol
-    return v;
-    }
@@ -118 +147 @@
-        debug assert (cast(AStringService)c);
-        with (cast(AStringService)c) {
-
+ {
-            clipboard = activeCont.toString(0);
+            debug logger.trace ("set clipboard to \"{}\"", clipboard);
+        }
-        }
-    });
@@ -125 +156 @@
-        debug assert (cast(AStringService)c);
-        with (cast(AStringService)c) {
-
+ {
-            activeCont = clipboard;
+            debug logger.trace ("assigned from clipboard: \"{}\"", activeCont.toString(0));
+        }
-        }
-    });
@@ -149 +182 @@
-    
-private:
+    /+NOTE: trying a different method
-    void childChangeCB (IContent icont) {
-    if (v == false) {   // then value changes iff icont()
@@ -167 +201 @@
-        endEvent;
-    }
-
++/
-    
-    bool v = false; // cache value so we can see when it changes

mde/gui/widget/AParentWidget.d

@@ -90 +90 @@
-    // They must at a minimum make sure widget's size is at least nmw by nmh.
-    public  override void minWChange (IChildWidget widget, wdim nmw) {
-
+!widget.isWSizable || 
-        widget.setWidth (nmw, -1);
-    }
-    public override void minHChange (IChildWidget widget, wdim nmh) {
-
+!widget.isHSizable || 
-        widget.setHeight (nmh, -1);
-    }

mde/gui/widget/Ifaces.d

@@ -107 +107 @@
-     * changes, since they cannot properly resize themselves.
-     * 
-
+
+
+
+
-     * Parents $(I must not) change their own size, even if they are not
-     * sizable; they may only change their childrens' sizes if it does not

mde/gui/widget/ParentContent.d

@@ -209 +209 @@
-        parent.minWChange (this, nmw);
-    } else {    // changes won't be seen, but we must follow function spec
-
+!widget.isWSizable || 
-        widget.setWidth (nmw, -1);
-    }
@@ -218 +218 @@
-        parent.minHChange (this, nmh);
-    } else {
-
+!widget.isHSizable || 
-        widget.setHeight (nmh, -1);
-    }
@@ -337 +337 @@
-    }
-    override void minHChange (IChildWidget widget, wdim nmh) {
-        
+   
-    if (display) {
-        mh = nmh;
@@ -387 +387 @@
-    if (display == content_()) return;
-        display = content_();
-
-
+
-            mw = subWidgets[0].minWidth;
-            mh = subWidgets[0].minHeight;
@@ -396 +395 @@
-        parent.minWChange (this, mw);
-        parent.minHChange (this, mh);
-        
+   
-        // set incase parent didn't:
-        subWidgets[0].setWidth (w, -1);

mde/gui/widget/WidgetManager.d

@@ -146 +146 @@
-    }
-        mw = nmw;
-
-
-
-
+
+
+
+
+
-        childRoot.setPosition (0,0);
-        requestRedraw;
@@ -160 +161 @@
-    }
-        mh = nmh;
-
-
-
-
+
+
+
+
+
-        childRoot.setPosition (0,0);
-        requestRedraw;
@@ -373 +375 @@
-        
-        debug (mdeWidgets) logger.trace ("Setting size and position of root widget...");
-
+
+
+
-        childRoot.setHeight (h, -1);
-        childRoot.setPosition (0,0);
@@ -386 +390 @@
-    
-    final void wmSizeEvent (int nw, int nh) {
-w
-h
+sW
+sH
-        matchMinimalSize;
-        
-        if (!childRoot) return;     // if not created yet.
-
-
+
+
+
+
+
+
+
+
-        childRoot.setPosition (0,0);
-    debug logWidgetSize (null);
@@ -476 +486 @@
-        underMouse = getPopupWidget (cx, cy, closePopup);
-        if (underMouse is null) {
-
+
+
+
+
-            underMouse = childRoot.getWidget (cx, cy);
-        }
@@ -489 +502 @@
-    
-    /** If possible, the screen-interaction derived class should override to
-
-
-
+
+
-     * 
-may not be required when this is called, however
+won't always be required when this is called
-    void matchMinimalSize () {
-
-
-
-
-
-
-
-
+
+
+
+
-    }
-    
@@ -622 +630 @@
-    wdim w,h;               // current widget size; should be at least (mw,mh) even if not displayable
-    wdim mw,mh;             // minimal area required by widgets
+    wdim sW,sH;             // actual screen size; ideally equal to w,h
-    uint setupN;            // n to pass to IChildWidget.setup
-    

mde/gui/widget/layout.d

@@ -639 +639 @@
-     *
-     * returns:
-
+
+
+
-    ptrdiff_t getCell (wdim l) {
-        debug assert (width, "AlignColumns not initialized when getCell called (code error)");
@@ -668 +670 @@
-        
-        wdim diff = nw - w;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        genPositions;
-        
-        debug if (nw != w) {
-trace
+error
-            /+ Also print column widths & positions:
-trace
+error
-            foreach (i,w; width)
-trace
+error
-        }
-        return w;
@@ -689 +699 @@
-    bool findResizeCols (wdim l) {
-        resizeU = -getCell (l);             // potential start for upward-resizes
-
-
+
+
+
+
+
+
-        resizeD = resizeU - 1;              // potential start for downward-resizes
-        
@@ -718 +732 @@
-        // do shrinking first (in case we hit the minimum)
-        if (diff >= 0) {
--adjustCellSizes (-diff, resizeU, 1)
-
+adjustCellSizes (-diff, resizeU, 1) - diff
+diff = 
-        } else {
-
-
-
+
+
+
+
-        genPositions;
-    }
@@ -752 +767 @@
-                return false;
-            minWidth[col] = nmw;
-
-
-
-
-
-
+
+
+
+
-        mw = spacing * cast(wdim)(cols - 1);
-        foreach (imw; minWidth)
-            mw += imw;
-        
-
+
+
+
+
+
-            width[col] = nmw;
-            foreach (cb; cbs)
-                cb.setWidth (col, nmw, -1);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        debug wdim ow = w;
-        genPositions;
@@ -801 +829 @@
-    *
-    * Returns:
-
+
+
-    *
-    * Will shrink non-sizable columns if they're over minimal size.
@@ -822 +851 @@
-            foreach (cb; cbs)
-                cb.setWidth (i, width[i], incr);
+        return 0;
-        }
-        else if (diff < 0) {        // decrease
@@ -844 +874 @@
-                i += incr;
-            }
-diff -=
+return
-        }
-        // else no adjustment needed (diff == 0)
-
-
+
-    }
-