DISTRHO
/
DISTRHO-Ports
mirror of https://github.com/DISTRHO/DISTRHO-Ports
1
0
Fork 0
Code Releases 5 Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
677 Commits
6 Branches
128MB
Tree: 4333073939
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '4333073939'
${ noResults }
DISTRHO-Ports/libs/juce7/patches/13_dialogwindow-allow-nativ...

110 lines
5.6KB
Raw Blame History 

  1. diff --git a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp

  2. index 2f5338f1c..789e6dc20 100644

  3. --- a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp

  4. +++ b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp

  5. @@ -921,7 +921,7 @@ void MainHostWindow::showAudioSettings()

  6.      o.componentToCentreAround       = this;

  7.      o.dialogBackgroundColour        = getLookAndFeel().findColour (ResizableWindow::backgroundColourId);

  8.      o.escapeKeyTriggersCloseButton  = true;

  9. -    o.useNativeTitleBar             = false;

  10. +    o.useNativeTitleBar             = true;

  11.      o.resizable                     = false;

  12.  

  13.       auto* w = o.create();

  14. diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.cpp b/modules/juce_gui_basics/windows/juce_DialogWindow.cpp

  15. index b024f9dde..c866ff208 100644

  16. --- a/modules/juce_gui_basics/windows/juce_DialogWindow.cpp

  17. +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.cpp

  18. @@ -134,7 +134,8 @@ void DialogWindow::showDialog (const String& dialogTitle,

  19.                                 Colour backgroundColour,

  20.                                 const bool escapeKeyTriggersCloseButton,

  21.                                 const bool resizable,

  22. -                               const bool useBottomRightCornerResizer)

  23. +                               const bool useBottomRightCornerResizer,

  24. +                               const bool useNativeTitleBar)

  25.  {

  26.      LaunchOptions o;

  27.      o.dialogTitle = dialogTitle;

  28. @@ -142,9 +143,9 @@ void DialogWindow::showDialog (const String& dialogTitle,

  29.      o.componentToCentreAround = componentToCentreAround;

  30.      o.dialogBackgroundColour = backgroundColour;

  31.      o.escapeKeyTriggersCloseButton = escapeKeyTriggersCloseButton;

  32. -    o.useNativeTitleBar = false;

  33.      o.resizable = resizable;

  34.      o.useBottomRightCornerResizer = useBottomRightCornerResizer;

  35. +    o.useNativeTitleBar = useNativeTitleBar;

  36.  

  37.      o.launchAsync();

  38.  }

  39. @@ -156,7 +157,8 @@ int DialogWindow::showModalDialog (const String& dialogTitle,

  40.                                     Colour backgroundColour,

  41.                                     const bool escapeKeyTriggersCloseButton,

  42.                                     const bool resizable,

  43. -                                   const bool useBottomRightCornerResizer)

  44. +                                   const bool useBottomRightCornerResizer,

  45. +                                   const bool useNativeTitleBar)

  46.  {

  47.      LaunchOptions o;

  48.      o.dialogTitle = dialogTitle;

  49. @@ -164,9 +166,9 @@ int DialogWindow::showModalDialog (const String& dialogTitle,

  50.      o.componentToCentreAround = componentToCentreAround;

  51.      o.dialogBackgroundColour = backgroundColour;

  52.      o.escapeKeyTriggersCloseButton = escapeKeyTriggersCloseButton;

  53. -    o.useNativeTitleBar = false;

  54.      o.resizable = resizable;

  55.      o.useBottomRightCornerResizer = useBottomRightCornerResizer;

  56. +    o.useNativeTitleBar = useNativeTitleBar;

  57.  

  58.      return o.runModal();

  59.  }

  60. diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.h b/modules/juce_gui_basics/windows/juce_DialogWindow.h

  61. index 484a08384..ad94a08ee 100644

  62. --- a/modules/juce_gui_basics/windows/juce_DialogWindow.h

  63. +++ b/modules/juce_gui_basics/windows/juce_DialogWindow.h

  64. @@ -199,7 +199,8 @@ public:

  65.                              Colour backgroundColour,

  66.                              bool escapeKeyTriggersCloseButton,

  67.                              bool shouldBeResizable = false,

  68. -                            bool useBottomRightCornerResizer = false);

  69. +                            bool useBottomRightCornerResizer = false,

  70. +                            bool useNativeTitleBar = true);

  71.  

  72.     #if JUCE_MODAL_LOOPS_PERMITTED

  73.      /** Easy way of quickly showing a dialog box containing a given component.

  74. @@ -245,7 +246,8 @@ public:

  75.                                  Colour backgroundColour,

  76.                                  bool escapeKeyTriggersCloseButton,

  77.                                  bool shouldBeResizable = false,

  78. -                                bool useBottomRightCornerResizer = false);

  79. +                                bool useBottomRightCornerResizer = false,

  80. +                                bool useNativeTitleBar = true);

  81.     #endif

  82.  

  83.  

  84. diff --git a/modules/juce_gui_basics/windows/juce_TopLevelWindow.h b/modules/juce_gui_basics/windows/juce_TopLevelWindow.h

  85. index 2eb400a70..4cd5aefe0 100644

  86. --- a/modules/juce_gui_basics/windows/juce_TopLevelWindow.h

  87. +++ b/modules/juce_gui_basics/windows/juce_TopLevelWindow.h

  88. @@ -154,7 +154,7 @@ protected:

  89.  private:

  90.      friend class TopLevelWindowManager;

  91.      friend class ResizableWindow;

  92. -    bool useDropShadow = true, useNativeTitleBar = false, isCurrentlyActive = false;

  93. +    bool useDropShadow = true, useNativeTitleBar = true, isCurrentlyActive = false;

  94.      std::unique_ptr<DropShadower> shadower;

  95.  

  96.      std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;

  97. diff --git a/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp b/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp

  98. index b90412cf2..b6c92e9fd 100644

  99. --- a/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp

  100. +++ b/modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp

  101. @@ -92,7 +92,7 @@ void PreferencesPanel::showInDialogBox (const String& dialogTitle, int dialogWid

  102.      o.dialogTitle                   = dialogTitle;

  103.      o.dialogBackgroundColour        = backgroundColour;

  104.      o.escapeKeyTriggersCloseButton  = false;

  105. -    o.useNativeTitleBar             = false;

  106. +    o.useNativeTitleBar             = true;

  107.      o.resizable                     = false;

  108.  

  109.      o.launchAsync();