Ticket #8735: patch.updated

diff --git a/src/apps/icon-o-matic/IconEditorApp.cpp b/src/apps/icon-o-matic/IconEditorApp.cpp
index 27f73a9..809d53a 100644
--- a/src/apps/icon-o-matic/IconEditorApp.cpp
+++ b/src/apps/icon-o-matic/IconEditorApp.cpp
@@ -18,6 +18,7 @@
 #include <Message.h>
 #include <Mime.h>
 #include <Path.h>
+#include <Screen.h>
 #include <storage/FindDirectory.h>
 
 #include "support_settings.h"
@@ -28,6 +29,58 @@
 #include "SavePanel.h"
 
 
+using namespace BPrivate;
+
+
+static const float kWindowOffset = 20;
+BRect gWindowRect(5 - kWindowOffset, 26 - kWindowOffset, 850, 780);
+
+
+namespace
+{
+   void
+   cascade()
+   {
+       BScreen screen;
+       BRect screenBorder = screen.Frame();
+       float left = gWindowRect.left + kWindowOffset;
+       if (left + gWindowRect.Width() > screenBorder.right)
+           left = 5;
+
+       float top = gWindowRect.top + kWindowOffset;
+       if (top + gWindowRect.Height() > screenBorder.bottom)
+           top = 26;
+
+       gWindowRect.OffsetTo(BPoint(left, top));
+   }
+
+
+   void
+   uncascade()
+   {
+       BScreen screen;
+       BRect screenBorder = screen.Frame();
+
+       float left = gWindowRect.left - kWindowOffset;
+       if (left < 5) {
+           left = screenBorder.right - gWindowRect.Width() - 5;
+           left = left - ((int)left % (int)kWindowOffset) + 5;
+       }
+
+       float top = gWindowRect.top - kWindowOffset;
+       if (top < 26) {
+           top = screenBorder.bottom - gWindowRect.Height() - 26;
+           top = top - ((int)left % (int)kWindowOffset) + 26;
+       }
+
+       gWindowRect.OffsetTo(BPoint(left, top));
+   }
+}
+
+
+// #pragma mark -
+
+
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "Icon-O-Matic-Main"
 
@@ -36,14 +89,11 @@ using std::nothrow;
 
 static const char* kAppSig = "application/x-vnd.haiku-icon_o_matic";
 
-static const float kWindowOffset = 20;
-
 
 IconEditorApp::IconEditorApp()
    :
    BApplication(kAppSig),
    fWindowCount(0),
-   fLastWindowFrame(50, 50, 900, 750),
 
    fOpenPanel(NULL),
    fSavePanel(NULL),
@@ -179,6 +229,7 @@ IconEditorApp::MessageReceived(BMessage* message)
        case MSG_WINDOW_CLOSED:
        {
            fWindowCount--;
+           uncascade();
            if (fWindowCount == 0)
                PostMessage(B_QUIT_REQUESTED);
            BMessage settings;
@@ -186,8 +237,8 @@ IconEditorApp::MessageReceived(BMessage* message)
                fLastWindowSettings = settings;
            BRect frame;
            if (message->FindRect("window frame", &frame) == B_OK) {
-               fLastWindowFrame = frame;
-               fLastWindowFrame.OffsetBy(-kWindowOffset, -kWindowOffset);
+               gWindowRect = frame;
+               uncascade();
            }
            break;
        }
@@ -272,8 +323,8 @@ IconEditorApp::ArgvReceived(int32 argc, char** argv)
 MainWindow*
 IconEditorApp::_NewWindow()
 {
-   fLastWindowFrame.OffsetBy(kWindowOffset, kWindowOffset);
-   MainWindow* window = new MainWindow(fLastWindowFrame, this,
+   cascade();
+   MainWindow* window = new MainWindow(gWindowRect, this,
        &fLastWindowSettings);
    fWindowCount++;
    return window;
@@ -352,7 +403,7 @@ IconEditorApp::_StoreSettings()
 {
    BMessage settings('stns');
 
-   settings.AddRect("window frame", fLastWindowFrame);
+   settings.AddRect("window frame", gWindowRect);
    settings.AddMessage("window settings", &fLastWindowSettings);
    settings.AddInt32("export mode", fSavePanel->ExportMode());
 
@@ -368,9 +419,9 @@ IconEditorApp::_RestoreSettings()
 
    BRect frame;
    if (settings.FindRect("window frame", &frame) == B_OK) {
-       fLastWindowFrame = frame;
+       gWindowRect = frame;
        // Compensate offset for next window...
-       fLastWindowFrame.OffsetBy(-kWindowOffset, -kWindowOffset);
+   uncascade();
    }
    settings.FindMessage("window settings", &fLastWindowSettings);
 
diff --git a/src/apps/icon-o-matic/IconEditorApp.h b/src/apps/icon-o-matic/IconEditorApp.h
index 44df93a..5b6b1fa 100644
--- a/src/apps/icon-o-matic/IconEditorApp.h
+++ b/src/apps/icon-o-matic/IconEditorApp.h
@@ -74,7 +74,6 @@ private:
 private:
            int32               fWindowCount;
            BMessage            fLastWindowSettings;
-           BRect               fLastWindowFrame;
 
            BFilePanel*         fOpenPanel;
            SavePanel*          fSavePanel;
diff --git a/src/apps/stylededit/StyledEditApp.cpp b/src/apps/stylededit/StyledEditApp.cpp
index ff66954..d1d85ec 100644
--- a/src/apps/stylededit/StyledEditApp.cpp
+++ b/src/apps/stylededit/StyledEditApp.cpp
@@ -32,7 +32,8 @@
 using namespace BPrivate;
 
 
-BRect gWindowRect(7-15, 26-15, 507, 426);
+static const float kWindowOffset = 20;
+BRect gWindowRect(5 - kWindowOffset, 26 - kWindowOffset, 507, 426);
 
 
 namespace
@@ -42,11 +43,11 @@ namespace
    {
        BScreen screen;
        BRect screenBorder = screen.Frame();
-       float left = gWindowRect.left + 15;
+       float left = gWindowRect.left + kWindowOffset;
        if (left + gWindowRect.Width() > screenBorder.right)
-           left = 7;
+           left = 5;
 
-       float top = gWindowRect.top + 15;
+       float top = gWindowRect.top + kWindowOffset;
        if (top + gWindowRect.Height() > screenBorder.bottom)
            top = 26;
 
@@ -60,16 +61,16 @@ namespace
        BScreen screen;
        BRect screenBorder = screen.Frame();
 
-       float left = gWindowRect.left - 15;
-       if (left < 7) {
-           left = screenBorder.right - gWindowRect.Width() - 7;
-           left = left - ((int)left % 15) + 7;
+       float left = gWindowRect.left - kWindowOffset;
+       if (left < 5) {
+           left = screenBorder.right - gWindowRect.Width() - 5;
+           left = left - ((int)left % (int)kWindowOffset) + 5;
        }
 
-       float top = gWindowRect.top - 15;
+       float top = gWindowRect.top - kWindowOffset;
        if (top < 26) {
            top = screenBorder.bottom - gWindowRect.Height() - 26;
-           top = top - ((int)left % 15) + 26;
+           top = top - ((int)left % (int)kWindowOffset) + 26;
        }
 
        gWindowRect.OffsetTo(BPoint(left, top));