8.9

1 files changed, 117 insertions, 146 deletions

diff --git a/wx+/std_button_layout.h b/wx+/std_button_layout.h
index 3e335882..ae9e9e1c 100644..100755
--- a/wx+/std_button_layout.h
+++ b/wx+/std_button_layout.h
@@ -1,146 +1,117 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0           *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#ifndef STD_BUTTON_LAYOUT_H_183470321478317214
-#define STD_BUTTON_LAYOUT_H_183470321478317214
-
-#include <algorithm>
-#include <wx/sizer.h>
-#include <wx/button.h>
-
-
-namespace zen
-{
-struct StdButtons
-{
-    StdButtons& setAffirmative (wxButton* btn) { btnYes    = btn; return *this; }
-    StdButtons& setNegative    (wxButton* btn) { btnNo     = btn; return *this; }
-    StdButtons& setCancel      (wxButton* btn) { btnCancel = btn; return *this; }
-
-    wxButton* btnYes    = nullptr;
-    wxButton* btnNo     = nullptr;
-    wxButton* btnCancel = nullptr;
-};
-
-void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons = StdButtons());
-//sizer width will change! => call wxWindow::Fit and wxWindow::Layout
-
-
-
-
-
-
-
-
-
-
-
-//--------------- impelementation -------------------------------------------
-inline
-void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons)
-{
-    assert(sizer.GetOrientation() == wxHORIZONTAL);
-
-    StdButtons buttonsTmp = buttons;
-
-    auto detach = [&](wxButton*& btn)
-    {
-        if (btn)
-        {
-            assert(btn->GetContainingSizer() == &sizer);
-            if (btn->IsShown())
-            {
-                bool rv = sizer.Detach(btn);
-                assert(rv);
-                if (!rv)
-                    btn = nullptr;
-            }
-            else
-                btn = nullptr;
-        }
-    };
-
-    detach(buttonsTmp.btnYes);
-    detach(buttonsTmp.btnNo);
-    detach(buttonsTmp.btnCancel);
-
-#if defined ZEN_WIN
-    //Windows User Experience Interaction Guidelines: https://msdn.microsoft.com/en-us/library/windows/desktop/aa511453#sizing
-    const int spaceH    = 6;  //OK
-    const int spaceRimH = 10; //OK
-    const int spaceRimV = 8;  //compromise; consider additional top row from static line; exact values: top 8, bottom 9
-#elif defined ZEN_LINUX
-    //GNOME Human Interface Guidelines: https://developer.gnome.org/hig-book/3.2/hig-book.html#alert-spacing
-    const int spaceH    = 6;  //OK
-    const int spaceRimH = 12; //OK
-    const int spaceRimV = 12; //OK
-#elif defined ZEN_MAC
-    //OS X Human Interface Guidelines: http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html
-    const int spaceH    = 14; //OK
-    const int spaceRimH = 24; //OK
-    const int spaceRimV = 14; //OK
-#endif
-
-    bool settingFirstButton = true;
-    auto attach = [&](wxButton* btn)
-    {
-        if (btn)
-        {
-            assert(btn->GetMinSize().GetHeight() == -1); //let OS or this routine do the sizing! note: OS X does not allow changing the (visible!) button height!
-#if defined ZEN_WIN || defined ZEN_LINUX
-            const int defaultHeight = wxButton::GetDefaultSize().GetHeight(); //buffered by wxWidgets
-            btn->SetMinSize(wxSize(-1, std::max(defaultHeight, 30))); //default button height is much too small => increase!
-#endif
-
-            if (settingFirstButton)
-                settingFirstButton = false;
-            else
-                sizer.Add(spaceH, 0);
-            sizer.Add(btn, 0, wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, spaceRimV);
-        }
-    };
-
-    //set border on left considering existing items
-    if (sizer.GetChildren().GetCount() > 0) //for yet another retarded reason wxWidgets will have wxSizer::GetItem(0) cause an assert rather than just return nullptr as documented
-        if (wxSizerItem* item = sizer.GetItem(static_cast<size_t>(0)))
-        {
-            assert(item->GetBorder() <= spaceRimV); //pragmatic check: other controls in the sizer should not have a larger border
-            int flag = item->GetFlag();
-            if (flag & wxLEFT)
-            {
-                flag &= ~wxLEFT;
-                item->SetFlag(flag);
-            }
-            sizer.Insert(static_cast<size_t>(0), spaceRimH, 0);
-        }
-
-    sizer.Add(spaceRimH, 0);
-#if defined ZEN_WIN
-    attach(buttonsTmp.btnYes);
-    attach(buttonsTmp.btnNo);
-    attach(buttonsTmp.btnCancel);
-
-#elif defined ZEN_LINUX
-    attach(buttonsTmp.btnNo);
-    attach(buttonsTmp.btnCancel);
-    attach(buttonsTmp.btnYes);
-
-#elif defined ZEN_MAC
-    if (buttonsTmp.btnNo)
-    {
-        attach(buttonsTmp.btnNo);
-        sizer.Add(83 - spaceH, 0); //OS X Human Interface Guidelines: "position it at least 24 pixels away from the “safe” buttons" -> however 83 is used in practice!
-    }
-    attach(buttonsTmp.btnCancel);
-    attach(buttonsTmp.btnYes);
-#endif
-    sizer.Add(spaceRimH, 0);
-
-    assert(buttonsTmp.btnCancel || buttonsTmp.btnYes); //OS X: there should be at least one button following the gap after the "dangerous" no-button
-}
-}
-
-#endif //STD_BUTTON_LAYOUT_H_183470321478317214
+// *****************************************************************************

+// * This file is part of the FreeFileSync project. It is distributed under    *

+// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0           *

+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *

+// *****************************************************************************

+

+#ifndef STD_BUTTON_LAYOUT_H_183470321478317214

+#define STD_BUTTON_LAYOUT_H_183470321478317214

+

+#include <algorithm>

+#include <wx/sizer.h>

+#include <wx/button.h>

+

+

+namespace zen

+{

+struct StdButtons

+{

+    StdButtons& setAffirmative (wxButton* btn) { btnYes    = btn; return *this; }

+    StdButtons& setNegative    (wxButton* btn) { btnNo     = btn; return *this; }

+    StdButtons& setCancel      (wxButton* btn) { btnCancel = btn; return *this; }

+

+    wxButton* btnYes    = nullptr;

+    wxButton* btnNo     = nullptr;

+    wxButton* btnCancel = nullptr;

+};

+

+void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons = StdButtons());

+//sizer width will change! => call wxWindow::Fit and wxWindow::Layout

+

+

+

+

+

+

+

+

+

+

+

+//--------------- impelementation -------------------------------------------

+inline

+void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons)

+{

+    assert(sizer.GetOrientation() == wxHORIZONTAL);

+

+    StdButtons buttonsTmp = buttons;

+

+    auto detach = [&](wxButton*& btn)

+    {

+        if (btn)

+        {

+            assert(btn->GetContainingSizer() == &sizer);

+            if (btn->IsShown())

+            {

+                bool rv = sizer.Detach(btn);

+                assert(rv);

+                if (!rv)

+                    btn = nullptr;

+            }

+            else

+                btn = nullptr;

+        }

+    };

+

+    detach(buttonsTmp.btnYes);

+    detach(buttonsTmp.btnNo);

+    detach(buttonsTmp.btnCancel);

+

+    //GNOME Human Interface Guidelines: https://developer.gnome.org/hig-book/3.2/hig-book.html#alert-spacing

+    const int spaceH    = 6;  //OK

+    const int spaceRimH = 12; //OK

+    const int spaceRimV = 12; //OK

+

+    bool settingFirstButton = true;

+    auto attach = [&](wxButton* btn)

+    {

+        if (btn)

+        {

+            assert(btn->GetMinSize().GetHeight() == -1); //let OS or this routine do the sizing! note: OS X does not allow changing the (visible!) button height!

+            const int defaultHeight = wxButton::GetDefaultSize().GetHeight(); //buffered by wxWidgets

+            btn->SetMinSize(wxSize(-1, std::max(defaultHeight, 30))); //default button height is much too small => increase!

+

+            if (settingFirstButton)

+                settingFirstButton = false;

+            else

+                sizer.Add(spaceH, 0);

+            sizer.Add(btn, 0, wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, spaceRimV);

+        }

+    };

+

+    //set border on left considering existing items

+    if (sizer.GetChildren().GetCount() > 0) //for yet another retarded reason wxWidgets will have wxSizer::GetItem(0) cause an assert rather than just return nullptr as documented

+        if (wxSizerItem* item = sizer.GetItem(static_cast<size_t>(0)))

+        {

+            assert(item->GetBorder() <= spaceRimV); //pragmatic check: other controls in the sizer should not have a larger border

+            int flag = item->GetFlag();

+            if (flag & wxLEFT)

+            {

+                flag &= ~wxLEFT;

+                item->SetFlag(flag);

+            }

+            sizer.Insert(static_cast<size_t>(0), spaceRimH, 0);

+        }

+

+    sizer.Add(spaceRimH, 0);

+    attach(buttonsTmp.btnNo);

+    attach(buttonsTmp.btnCancel);

+    attach(buttonsTmp.btnYes);

+

+    sizer.Add(spaceRimH, 0);

+

+    assert(buttonsTmp.btnCancel || buttonsTmp.btnYes); //OS X: there should be at least one button following the gap after the "dangerous" no-button

+}

+}

+

+#endif //STD_BUTTON_LAYOUT_H_183470321478317214