Ticket #2724: B_OUTLINE_RESIZE-1.patch

src/servers/app/Desktop.cpp

@@ -1443 +1443 @@
 
 
 void
+Desktop::SetWindowOutlinesDelta(Window* window, BPoint delta)
+{
+    AutoWriteLocker _(fWindowLock);
+
+    if (!window->IsVisible())
+        return;
+
+    BRegion newDirtyRegion;
+    window->SetOutlinesDelta(delta, &newDirtyRegion);
+
+    BRegion background;
+    _RebuildClippingForAllWindows(background);
+
+    MarkDirty(newDirtyRegion);
+    _SetBackground(background);
+}
+
+
+void
 Desktop::ResizeWindowBy(Window* window, float x, float y)
 {
     if (x == 0 && y == 0)
@@ -1485 +1504 @@
     // make sure the window cannot mark stuff dirty outside
     // its visible region...
     newDirtyRegion.IntersectWith(&window->VisibleRegion());
-    // ...because we do this outself
+    // ...because we do this ourself
     newDirtyRegion.Include(&previouslyOccupiedRegion);
 
     MarkDirty(newDirtyRegion);

src/servers/app/Desktop.h

@@ -172 +172 @@
 
             void                MoveWindowBy(Window* window, float x, float y,
                                     int32 workspace = -1);
+            void                SetWindowOutlinesDelta(Window* window,
+                                    BPoint delta);
             void                ResizeWindowBy(Window* window, float x,
                                     float y);
             bool                SetWindowTabLocation(Window* window,

src/servers/app/Window.cpp

@@ -334 +334 @@
 
 
 void
+Window::SetOutlinesDelta(BPoint delta, BRegion* dirtyRegion)
+{
+    float wantWidth = fFrame.IntegerWidth() + delta.x;
+    float wantHeight = fFrame.IntegerHeight() + delta.y;
+
+    // enforce size limits
+    WindowStack* stack = GetWindowStack();
+    if (stack) {
+        for (int32 i = 0; i < stack->CountWindows(); i++) {
+            Window* window = stack->WindowList().ItemAt(i);
+
+            if (wantWidth < window->fMinWidth)
+                wantWidth = window->fMinWidth;
+            if (wantWidth > window->fMaxWidth)
+                wantWidth = window->fMaxWidth;
+
+            if (wantHeight < window->fMinHeight)
+                wantHeight = window->fMinHeight;
+            if (wantHeight > window->fMaxHeight)
+                wantHeight = window->fMaxHeight;
+        }
+
+        delta.x = wantWidth - fFrame.IntegerWidth();
+        delta.y = wantHeight - fFrame.IntegerHeight();
+    }
+
+    ::Decorator* decorator = Decorator();
+
+    if (decorator)
+        decorator->SetOutlinesDelta(delta, dirtyRegion);
+}
+
+
+void
 Window::ResizeBy(int32 x, int32 y, BRegion* dirtyRegion, bool resizeStack)
 {
     // this function is only called from the desktop thread

src/servers/app/Window.h

@@ -126 +126 @@
             void                GetContentRegion(BRegion* region);
 
             void                MoveBy(int32 x, int32 y, bool moveStack = true);
+            void                SetOutlinesDelta(BPoint delta,
+                                    BRegion* dirtyRegion);
             void                ResizeBy(int32 x, int32 y,
                                     BRegion* dirtyRegion,
                                     bool resizeStack = true);

src/servers/app/decorator/Decorator.cpp

@@ -546 +546 @@
 }
 
 
+void
+Decorator::SetOutlinesDelta(BPoint delta, BRegion* dirty)
+{
+    _SetOutlinesDelta(delta, dirty);
+    _InvalidateFootprint();
+}
+
+
 /*! \brief Resizes the decorator frame
 
     This is a required function for subclasses to implement - the default does
@@ -887 +895 @@
 }
 
 
+void
+Decorator::_SetOutlinesDelta(BPoint offset, BRegion* dirty)
+{
+    // Implemented by subclasses.
+}
+
+
 bool
 Decorator::_SetSettings(const BMessage& settings, BRegion* updateRegion)
 {

src/servers/app/decorator/Decorator.h

@@ -143 +143 @@
 
             void            MoveBy(float x, float y);
             void            MoveBy(BPoint offset);
+            void            SetOutlinesDelta(BPoint delta, BRegion* dirty);
             void            ResizeBy(float x, float y, BRegion* dirty);
             void            ResizeBy(BPoint offset, BRegion* dirty);
 
@@ -204 +205 @@
                                 BRegion* updateRegion = NULL);
 
     virtual void            _MoveBy(BPoint offset);
+    virtual void            _SetOutlinesDelta(BPoint offset, BRegion* dirty);
     virtual void            _ResizeBy(BPoint offset, BRegion* dirty) = 0;
 
     virtual bool            _SetSettings(const BMessage& settings,
@@ -223 +225 @@
             DrawingEngine*  fDrawingEngine;
             DrawState       fDrawState;
 
+            BPoint          fOutlinesDelta;
+
             BRect           fTitleBarRect;
             BRect           fFrame;
             BRect           fResizeRect;

src/servers/app/decorator/DefaultDecorator.cpp

@@ -794 +794 @@
 
     // Draw the resize knob if we're supposed to
     if (!(fTopTab->flags & B_NOT_RESIZABLE)) {
-        r = fResizeRect;
-
         ComponentColors colors;
         _GetComponentColors(COMPONENT_RESIZE_CORNER, colors, fTopTab);
 
         switch ((int)fTopTab->look) {
             case B_DOCUMENT_WINDOW_LOOK:
             {
-                if (!invalid.Intersects(r))
-                    break;
-
-                float x = r.right - 3;
-                float y = r.bottom - 3;
-
-                BRect bg(x - 13, y - 13, x, y);
-
-                BGradientLinear gradient;
-                gradient.SetStart(bg.LeftTop());
-                gradient.SetEnd(bg.RightBottom());
-                gradient.AddColor(colors[1], 0);
-                gradient.AddColor(colors[2], 255);
-
-                fDrawingEngine->FillRect(bg, gradient);
+                if (fOutlinesDelta.x != 0 || fOutlinesDelta.y != 0) {
+                    r.Set(fFrame.right - 13, fFrame.bottom - 13,
+                        fFrame.right + 3, fFrame.bottom + 3);
 
-                fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15),
-                    BPoint(x - 15, y - 2), colors[0]);
-                fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14),
-                    BPoint(x - 14, y - 1), colors[1]);
-                fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15),
-                    BPoint(x - 2, y - 15), colors[0]);
-                fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14),
-                    BPoint(x - 1, y - 14), colors[1]);
+                    if (invalid.Intersects(r))
+                        _DrawResizeKnob(r, false, colors);
+                }
 
-                if (fTopTab && !IsFocus(fTopTab))
-                    break;
+                if (invalid.Intersects(fResizeRect))
+                    _DrawResizeKnob(fResizeRect, fTopTab && IsFocus(fTopTab), colors);
 
-                static const rgb_color kWhite
-                    = (rgb_color){ 255, 255, 255, 255 };
-                for (int8 i = 1; i <= 4; i++) {
-                    for (int8 j = 1; j <= i; j++) {
-                        BPoint pt1(x - (3 * j) + 1, y - (3 * (5 - i)) + 1);
-                        BPoint pt2(x - (3 * j) + 2, y - (3 * (5 - i)) + 2);
-                        fDrawingEngine->StrokePoint(pt1, colors[0]);
-                        fDrawingEngine->StrokePoint(pt2, kWhite);
-                    }
-                }
                 break;
             }
 
@@ -873 +844 @@
 
 
 void
+DefaultDecorator::_DrawResizeKnob(BRect r, bool full, const ComponentColors& colors)
+{
+    float x = r.right -= 3;
+    float y = r.bottom -= 3;
+
+    BGradientLinear gradient;
+    gradient.SetStart(r.LeftTop());
+    gradient.SetEnd(r.RightBottom());
+    gradient.AddColor(colors[1], 0);
+    gradient.AddColor(colors[2], 255);
+
+    fDrawingEngine->FillRect(r, gradient);
+
+    fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15),
+        BPoint(x - 15, y - 2), colors[0]);
+    fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14),
+        BPoint(x - 14, y - 1), colors[1]);
+    fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15),
+        BPoint(x - 2, y - 15), colors[0]);
+    fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14),
+        BPoint(x - 1, y - 14), colors[1]);
+
+    if (!full)
+        return;
+
+    static const rgb_color kWhite
+        = (rgb_color){ 255, 255, 255, 255 };
+    for (int8 i = 1; i <= 4; i++) {
+        for (int8 j = 1; j <= i; j++) {
+            BPoint pt1(x - (3 * j) + 1, y - (3 * (5 - i)) + 1);
+            BPoint pt2(x - (3 * j) + 2, y - (3 * (5 - i)) + 2);
+            fDrawingEngine->StrokePoint(pt1, colors[0]);
+            fDrawingEngine->StrokePoint(pt2, kWhite);
+        }
+    }
+}
+
+
+void
 DefaultDecorator::_DrawTab(Decorator::Tab* tab, BRect invalid)
 {
     STRACE(("_DrawTab(%.1f,%.1f,%.1f,%.1f)\n",
@@ -1151 +1161 @@
 
 
 void
+DefaultDecorator::_SetOutlinesDelta(BPoint delta, BRegion* dirty)
+{
+    BPoint offset = delta - fOutlinesDelta;
+    fOutlinesDelta = delta;
+
+    dirty->Include(fLeftBorder);
+    dirty->Include(fRightBorder);
+    dirty->Include(fTopBorder);
+    dirty->Include(fBottomBorder);
+
+    fBorderRect.right += offset.x;
+    fBorderRect.bottom += offset.y;
+
+    fLeftBorder.bottom += offset.y;
+    fTopBorder.right += offset.x;
+
+    fRightBorder.OffsetBy(offset.x, 0.0);
+    fRightBorder.bottom += offset.y;
+
+    fBottomBorder.OffsetBy(0.0, offset.y);
+    fBottomBorder.right += offset.x;
+
+    dirty->Include(fLeftBorder);
+    dirty->Include(fRightBorder);
+    dirty->Include(fTopBorder);
+    dirty->Include(fBottomBorder);
+
+    dirty->Exclude(fFrame);
+        // The key thing about B_OUTLINE_RESIZE
+
+    dirty->Include(fResizeRect);
+    fResizeRect.OffsetBy(offset);
+    dirty->Include(fResizeRect);
+}
+
+
+void
 DefaultDecorator::_ResizeBy(BPoint offset, BRegion* dirty)
 {
     STRACE(("DefaultDecorator: Resize By (%.1f, %.1f)\n", offset.x, offset.y));
@@ -1315 +1362 @@
                 fOldMovingTab = _tab->tabRect;
         }
     }
-    
+
     DefaultDecorator::Tab* tab = static_cast<DefaultDecorator::Tab*>(_tab);
     BRect& tabRect = tab->tabRect;
     if (tabRect.IsValid() == false)
@@ -1357 +1404 @@
     rect.bottom++;
     if (updateRegion != NULL)
         updateRegion->Include(rect);
-    
+
     return true;
 }
 
@@ -1455 +1502 @@
     region->Include(&fTabsRegion);
 
     if (fTopTab->look == B_DOCUMENT_WINDOW_LOOK) {
-        // include the rectangular resize knob on the bottom right
-        float knobSize = kResizeKnobSize - fBorderWidth;
-        region->Include(BRect(fFrame.right - knobSize, fFrame.bottom - knobSize,
-            fFrame.right, fFrame.bottom));
+        region->Include(BRect(fFrame.right - 13.0f, fFrame.bottom - 13.0f,
+                        fFrame.right, fFrame.bottom));
+
+        region->Include(fResizeRect);
     }
 }
 

src/servers/app/decorator/DefaultDecorator.h

@@ -110 +110 @@
             DefaultDecorator::Tab*  _TabAt(int32 index) const;
 
     virtual void                _DrawFrame(BRect r);
+    virtual void                _DrawResizeKnob(BRect r, bool full,
+                                    const ComponentColors& color);
     virtual void                _DrawTab(Decorator::Tab* tab, BRect r);
 
     virtual void                _DrawClose(Decorator::Tab* tab, bool direct,
@@ -132 +134 @@
                                     BRegion* updateRegion = NULL);
 
     virtual void                _MoveBy(BPoint offset);
+    virtual void                _SetOutlinesDelta(BPoint delta, BRegion* dirty);
     virtual void                _ResizeBy(BPoint offset, BRegion* dirty);
 
     virtual bool                _SetTabLocation(Decorator::Tab* tab,

src/servers/app/decorator/DefaultWindowBehaviour.cpp

@@ -17 +17 @@
 
 #include <math.h>
 
+#include <PortLink.h>
 #include <WindowPrivate.h>
 
+#include "AppServer.h"
 #include "ClickTarget.h"
 #include "Desktop.h"
 #include "DefaultDecorator.h"
@@ -250 +252 @@
 
 
 struct DefaultWindowBehaviour::ResizeState : MouseTrackingState {
+    BPoint fDelta;
+
     ResizeState(DefaultWindowBehaviour& behavior, BPoint where,
         bool activateOnMouseUp)
         :
-        MouseTrackingState(behavior, where, activateOnMouseUp, false)
+        MouseTrackingState(behavior, where, activateOnMouseUp, true)
+    {
+        fDelta = BPoint(0, 0);
+    }
+
+    virtual void EnterState(State* prevState)
+    {
+
+    }
+
+    virtual void ExitState(State* nextState)
     {
+        if (fWindow->Flags() & B_OUTLINE_RESIZE) {
+            fDesktop->SetWindowOutlinesDelta(fWindow, BPoint(0, 0));
+            fDesktop->ResizeWindowBy(fWindow, fDelta.x, fDelta.y);
+        }
     }
 
     virtual void MouseMovedAction(BPoint& delta, bigtime_t now)
@@ -267 +285 @@
 
             BPoint oldRightBottom = fWindow->Frame().RightBottom();
 
-            fDesktop->ResizeWindowBy(fWindow, delta.x, delta.y);
+            if (fWindow->Flags() & B_OUTLINE_RESIZE) {
+                fDelta = delta;
+                fDesktop->SetWindowOutlinesDelta(fWindow, delta);
+            } else
+                fDesktop->ResizeWindowBy(fWindow, delta.x, delta.y);
 
             // constrain delta to true change in size
             delta = fWindow->Frame().RightBottom() - oldRightBottom;
@@ -336 +358 @@
                 neighbourTab->tabOffset + neighbourTab->tabRect.Width() / 2)
                 return;
         }
-        
+
         fWindow->MoveToStackPosition(neighbourIndex, isShifting);
     }
 };