From bc0b6d62f012e84fcf9b5ca50e4b86dfd881d71c Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 19 Aug 2017 14:34:56 +0100 Subject: [PATCH] DialogWindow: Allow native titlebar --- modules/juce_gui_basics/windows/juce_DialogWindow.cpp | 10 ++++++---- modules/juce_gui_basics/windows/juce_DialogWindow.h | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.cpp b/modules/juce_gui_basics/windows/juce_DialogWindow.cpp index b03824d6dd..be3d9e58dc 100644 --- a/modules/juce_gui_basics/windows/juce_DialogWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.cpp @@ -137,7 +137,8 @@ void DialogWindow::showDialog (const String& dialogTitle, Colour backgroundColour, const bool escapeKeyTriggersCloseButton, const bool resizable, - const bool useBottomRightCornerResizer) + const bool useBottomRightCornerResizer, + const bool useNativeTitleBar) { LaunchOptions o; o.dialogTitle = dialogTitle; @@ -145,9 +146,9 @@ void DialogWindow::showDialog (const String& dialogTitle, o.componentToCentreAround = componentToCentreAround; o.dialogBackgroundColour = backgroundColour; o.escapeKeyTriggersCloseButton = escapeKeyTriggersCloseButton; - o.useNativeTitleBar = false; o.resizable = resizable; o.useBottomRightCornerResizer = useBottomRightCornerResizer; + o.useNativeTitleBar = useNativeTitleBar; o.launchAsync(); } @@ -159,7 +160,8 @@ int DialogWindow::showModalDialog (const String& dialogTitle, Colour backgroundColour, const bool escapeKeyTriggersCloseButton, const bool resizable, - const bool useBottomRightCornerResizer) + const bool useBottomRightCornerResizer, + const bool useNativeTitleBar) { LaunchOptions o; o.dialogTitle = dialogTitle; @@ -167,9 +169,9 @@ int DialogWindow::showModalDialog (const String& dialogTitle, o.componentToCentreAround = componentToCentreAround; o.dialogBackgroundColour = backgroundColour; o.escapeKeyTriggersCloseButton = escapeKeyTriggersCloseButton; - o.useNativeTitleBar = false; o.resizable = resizable; o.useBottomRightCornerResizer = useBottomRightCornerResizer; + o.useNativeTitleBar = useNativeTitleBar; return o.runModal(); } diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.h b/modules/juce_gui_basics/windows/juce_DialogWindow.h index 0ee09dfa44..44b662b266 100644 --- a/modules/juce_gui_basics/windows/juce_DialogWindow.h +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.h @@ -190,7 +190,8 @@ public: Colour backgroundColour, bool escapeKeyTriggersCloseButton, bool shouldBeResizable = false, - bool useBottomRightCornerResizer = false); + bool useBottomRightCornerResizer = false, + bool useNativeTitleBar = false); #if JUCE_MODAL_LOOPS_PERMITTED || DOXYGEN /** Easy way of quickly showing a dialog box containing a given component. @@ -236,7 +237,8 @@ public: Colour backgroundColour, bool escapeKeyTriggersCloseButton, bool shouldBeResizable = false, - bool useBottomRightCornerResizer = false); + bool useBottomRightCornerResizer = false, + bool useNativeTitleBar = false); #endif