Changeset 15385

Timestamp:

12/06/05 18:15:48 (3 years ago)

Author:

axeld

Message:

The resize code now works correctly, finally - it temporarily did harm ;)
The BViews must be resized directly after every change in the window size - we
cannot wait until B_WINDOW_RESIZED, since subsequent calls have wrong view
sizes, then.
B_WINDOW_RESIZED is only really useful for app_server caused window resizing.
Added TODO to SetLook(): it may change the window size as well.

Location:

haiku/trunk

Files:

• headers/os/interface/Window.h (modified) (1 diff)
• src/kits/interface/Window.cpp (modified) (5 diffs)

haiku/trunk/headers/os/interface/Window.h

@@ -286 +286 @@
 
                         void            _CreateTopView();
+                        void            _AdoptResize();
                         void            _SetFocus(BView *focusView, bool notifyIputServer = false);
 

haiku/trunk/src/kits/interface/Window.cpp

@@ -738 +738 @@
                                 fFrame.bottom = fFrame.top + height;
 
-                                // Resize views according to their resize modes - this
-                                // saves us some server communication, as the server
-                                // does the same with our views on its side.
-                                fTopView->_ResizeBy(width - fTopView->Bounds().Width(),
-                                        height - fTopView->Bounds().Height());
-
+                                _AdoptResize();
                                 FrameResized(width, height);
                         }
@@ -1063 +1058 @@
                         fLink->Read<float>(&fMinHeight);
                         fLink->Read<float>(&fMaxHeight);
+
+                        _AdoptResize();
+                                // TODO: the same has to be done for SetLook() (that can alter
+                                //              the size limits, and hence, the size of the window
                 }
                 Unlock();
@@ -1622 +1621 @@
         if (fLink->FlushWithReply(status) == B_OK && status == B_OK)
                 fLook = look;
+
+        // TODO: this could have changed the window size, and thus, we
+        //      need to get it from the server (and call _AdoptResize()).
 
         return status;
@@ -1850 +1852 @@
 
                 fFrame.SetRightBottom(fFrame.RightBottom() + BPoint(dx, dy));
+                _AdoptResize();
         }
         Unlock();
@@ -2369 +2372 @@
 
         STRACE(("BuildTopView ended\n"));
+}
+
+
+/*!
+        Resizes the top view to match the window size. This will also
+        adapt the size of all its child views as needed.
+        This method has to be called whenever the frame of the window
+        changes.
+*/
+void
+BWindow::_AdoptResize()
+{
+        // Resize views according to their resize modes - this
+        // saves us some server communication, as the server
+        // does the same with our views on its side.
+
+        int32 deltaWidth = fFrame.Width() - fTopView->Bounds().Width();
+        int32 deltaHeight = fFrame.Height() - fTopView->Bounds().Height();
+        if (deltaWidth == 0 && deltaHeight == 0)
+                return;
+
+        fTopView->_ResizeBy(deltaWidth, deltaHeight);
 }