Browse Source

Allow and use native titlebars in regular dialogs

Signed-off-by: falkTX <falktx@falktx.com>
v6.1.6-distrho
falkTX 2 years ago
parent
commit
9bc55acde7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 13 additions and 9 deletions
  1. +1
    -1
      extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
  2. +6
    -4
      modules/juce_gui_basics/windows/juce_DialogWindow.cpp
  3. +4
    -2
      modules/juce_gui_basics/windows/juce_DialogWindow.h
  4. +1
    -1
      modules/juce_gui_basics/windows/juce_TopLevelWindow.h
  5. +1
    -1
      modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp

+ 1
- 1
extras/AudioPluginHost/Source/UI/MainHostWindow.cpp View File

@@ -842,7 +842,7 @@ void MainHostWindow::showAudioSettings()
o.componentToCentreAround = this;
o.dialogBackgroundColour = getLookAndFeel().findColour (ResizableWindow::backgroundColourId);
o.escapeKeyTriggersCloseButton = true;
o.useNativeTitleBar = false;
o.useNativeTitleBar = true;
o.resizable = false;
auto* w = o.create();


+ 6
- 4
modules/juce_gui_basics/windows/juce_DialogWindow.cpp View File

@@ -134,7 +134,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;
@@ -142,9 +143,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();
}
@@ -156,7 +157,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;
@@ -164,9 +166,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();
}


+ 4
- 2
modules/juce_gui_basics/windows/juce_DialogWindow.h View File

@@ -199,7 +199,8 @@ public:
Colour backgroundColour,
bool escapeKeyTriggersCloseButton,
bool shouldBeResizable = false,
bool useBottomRightCornerResizer = false);
bool useBottomRightCornerResizer = false,
bool useNativeTitleBar = true);
#if JUCE_MODAL_LOOPS_PERMITTED
/** Easy way of quickly showing a dialog box containing a given component.
@@ -245,7 +246,8 @@ public:
Colour backgroundColour,
bool escapeKeyTriggersCloseButton,
bool shouldBeResizable = false,
bool useBottomRightCornerResizer = false);
bool useBottomRightCornerResizer = false,
bool useNativeTitleBar = true);
#endif


+ 1
- 1
modules/juce_gui_basics/windows/juce_TopLevelWindow.h View File

@@ -154,7 +154,7 @@ protected:
private:
friend class TopLevelWindowManager;
friend class ResizableWindow;
bool useDropShadow = true, useNativeTitleBar = false, isCurrentlyActive = false;
bool useDropShadow = true, useNativeTitleBar = true, isCurrentlyActive = false;
std::unique_ptr<DropShadower> shadower;
std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;


+ 1
- 1
modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp View File

@@ -92,7 +92,7 @@ void PreferencesPanel::showInDialogBox (const String& dialogTitle, int dialogWid
o.dialogTitle = dialogTitle;
o.dialogBackgroundColour = backgroundColour;
o.escapeKeyTriggersCloseButton = false;
o.useNativeTitleBar = false;
o.useNativeTitleBar = true;
o.resizable = false;
o.launchAsync();


Loading…
Cancel
Save