mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-02 03:20:06 +00:00
Code Activity

DocumentWindow: Ensure button callbacks are called on Windows

Browse source
This commit is contained in:
reuk 2024-09-30 12:39:47 +01:00
parent 1798b12d4b
commit c02ec2e3d5
4 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/juce_gui_basics/components/juce_Component.h
View file

@ -925,9 +925,32 @@ public:
window's caption area to the edge of the screen), double-clicking a horizontal border to
stretch a window vertically, and the window tiling flyout that appears when hovering the
mouse over the maximise button.
This is called by the peer. Component subclasses may override this but should not call it directly.
*/
virtual WindowControlKind findControlAtPoint (Point<float>) const { return WindowControlKind::client; }
/** For components that are added to the desktop, this may be called to indicate that the mouse
was clicked inside the area of the "close" control. This is currently only called on Windows.
This is called by the peer. Component subclasses may override this but should not call it directly.
*/
virtual void windowControlClickedClose() {}
/** For components that are added to the desktop, this may be called to indicate that the mouse
was clicked inside the area of the "minimise" control. This is currently only called on Windows.
This is called by the peer. Component subclasses may override this but should not call it directly.
*/
virtual void windowControlClickedMinimise() {}
/** For components that are added to the desktop, this may be called to indicate that the mouse
was clicked inside the area of the "maximise" control. This is currently only called on Windows.
This is called by the peer. Component subclasses may override this but should not call it directly.
*/
virtual void windowControlClickedMaximise() {}
/** Changes the default return value for the hitTest() method.
Setting this to false is an easy way to make a component pass all its mouse events

22
modules/juce_gui_basics/native/juce_Windowing_windows.cpp
View file

@ -4304,17 +4304,33 @@ private:
switch (wParam)
{
case HTCLOSE:
PostMessage (h, WM_CLOSE, 0, 0);
if ((styleFlags & windowHasCloseButton) != 0 && ! sendInputAttemptWhenModalMessage())
{
if (hasTitleBar())
PostMessage (h, WM_CLOSE, 0, 0);
else
component.windowControlClickedClose();
}
return 0;
case HTMAXBUTTON:
if ((styleFlags & windowHasMaximiseButton) != 0 && ! sendInputAttemptWhenModalMessage())
setFullScreen (! isFullScreen());
{
if (hasTitleBar())
setFullScreen (! isFullScreen());
else
component.windowControlClickedMaximise();
}
return 0;
case HTMINBUTTON:
if ((styleFlags & windowHasMinimiseButton) != 0 && ! sendInputAttemptWhenModalMessage())
setMinimised (true);
{
if (hasTitleBar())
setMinimised (true);
else
component.windowControlClickedMinimise();
}
return 0;
}
break;

15
modules/juce_gui_basics/windows/juce_DocumentWindow.cpp
View file

@ -192,6 +192,21 @@ void DocumentWindow::maximiseButtonPressed()
setFullScreen (! isFullScreen());
}
void DocumentWindow::windowControlClickedClose()
{
closeButtonPressed();
}
void DocumentWindow::windowControlClickedMinimise()
{
minimiseButtonPressed();
}
void DocumentWindow::windowControlClickedMaximise()
{
maximiseButtonPressed();
}
//==============================================================================
void DocumentWindow::paint (Graphics& g)
{

6
modules/juce_gui_basics/windows/juce_DocumentWindow.h
View file

@ -294,6 +294,12 @@ public:
Rectangle<int> getTitleBarArea() const;
/** @internal */
WindowControlKind findControlAtPoint (Point<float>) const override;
/** @internal */
void windowControlClickedClose() override;
/** @internal */
void windowControlClickedMinimise() override;
/** @internal */
void windowControlClickedMaximise() override;
#endif
private: