Skip to content

Commit 003cee7

Browse files
committed
Ready for full release of the macOS port
1 parent b765a9e commit 003cee7

File tree

6 files changed

+10
-26
lines changed

6 files changed

+10
-26
lines changed

Framework/C/Interfaces/CWindowInterface.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ extern "C"
7676
UIMGUI_PUBLIC_API void UImGui_Window_Platform_setWindowAlwaysOnBottom();
7777

7878
// Event Safety - begin, style, post-begin
79-
// Available for platforms - X11, Win32 & macOS
79+
// Available for platforms - X11, Win32
8080
// Platforms to be supported - Wayland
8181
UIMGUI_PUBLIC_API void UImGui_Window_Platform_setWindowShowingOnPager(bool bShowInPager);
8282
// Event Safety - begin, style, post-begin
83-
// Available for platforms - X11, Win32 & macOS
83+
// Available for platforms - X11, Win32
8484
// Platforms to be supported - Wayland
8585
UIMGUI_PUBLIC_API bool UImGui_Window_Platform_getWindowShowingOnPager();
8686

8787
// Event Safety - begin, style, post-begin
88-
// Available for platforms - X11, Win32 & macOS
88+
// Available for platforms - X11, Win32
8989
// Platforms to be supported - Wayland
9090
UIMGUI_PUBLIC_API void UImGui_Window_Platform_setWindowShowingOnTaskbar(bool bShowOnTaskbar);
9191
// Event Safety - begin, style, post-begin
92-
// Available for platforms - X11, Win32 & macOS
92+
// Available for platforms - X11, Win32
9393
// Platforms to be supported - Wayland
9494
UIMGUI_PUBLIC_API bool UImGui_Window_Platform_getWindowShowingOnTaskbar();
9595

Framework/Core/Interfaces/WindowInterface.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ namespace UImGui
7676
// Event Safety - begin, style, post-begin
7777
// Platform note: On Win32 "setWindowShowingOnPager" and "setWindowShowingOnTaskbar" run the same code,
7878
// as it is not possible to disable the window from showing on both the taskbar and window switcher
79-
// Available for platforms - X11, Win32, macOS
79+
// Available for platforms - X11, Win32
8080
// Platforms to be supported - Wayland
8181
static void setWindowShowingOnPager(bool bShowInPager) noexcept;
8282
// Event Safety - begin, style, post-begin
83-
// Available for platforms - X11, Win32, macOS
83+
// Available for platforms - X11, Win32
8484
// Platforms to be supported - Wayland
8585
static bool getWindowShowingOnPager() noexcept;
8686

8787
// Event Safety - begin, style, post-begin
88-
// Available for platforms - X11, Win32, macOS
88+
// Available for platforms - X11, Win32
8989
// Platforms to be supported - Wayland
9090
static void setWindowShowingOnTaskbar(bool bShowOnTaskbar) noexcept;
9191
// Event Safety - begin, style, post-begin
92-
// Available for platforms - X11, Win32, macOS
92+
// Available for platforms - X11, Win32
9393
// Platforms to be supported - Wayland
9494
static bool getWindowShowingOnTaskbar() noexcept;
9595

Framework/Renderer/Utils/Window.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,6 @@ void UImGui::WindowInternal::setShowWindowInPager(const bool bShowInPagerr) noex
577577
LONG_PTR style = GetWindowLongPtr(window, GWL_EXSTYLE);
578578
SetWindowLongPtr(window, GWL_EXSTYLE, (style & WS_EX_APPWINDOW) | ~WS_EX_TOOLWINDOW);
579579
}
580-
#else
581-
MacOSWindow::setShowWindowInPager(glfwGetCocoaWindow(windowMain), bShowInPagerr);
582580
#endif
583581
#endif
584582
}
@@ -634,8 +632,6 @@ void UImGui::WindowInternal::setShowWindowOnTaskbar(const bool bShowOnTaskbarr)
634632
LONG_PTR style = GetWindowLongPtr(window, GWL_EXSTYLE);
635633
SetWindowLongPtr(window, GWL_EXSTYLE, (style & WS_EX_APPWINDOW) | ~WS_EX_TOOLWINDOW);
636634
}
637-
#else
638-
MacOSWindow::setShowWindowOnTaskbar(glfwGetCocoaWindow(windowMain), bShowOnTaskbarr);
639635
#endif
640636
#endif
641637
}

Framework/Renderer/Utils/Window.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ namespace UImGui
146146
// TODO: Port to Wayland
147147
void setWindowAlwaysBelow() noexcept;
148148

149-
// As of now, only supported on X11, Win32 & macOS
149+
// As of now, only supported on X11 & Win32
150150
// TODO: Port to Wayland
151151
void setShowWindowInPager(bool bShowInPagerr) noexcept;
152152

153-
// As of now, only supported on X11, Win32 & macOS
153+
// As of now, only supported on X11 & Win32
154154
// TODO: Port to Wayland
155155
void setShowWindowOnTaskbar(bool bShowOnTaskbarr) noexcept;
156156

Framework/Renderer/Utils/macOS/MacOSWindowPlatform.h

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
namespace UImGui::MacOSWindow
55
{
6-
void setShowWindowOnTaskbar(void* window, bool bShow);
7-
void setShowWindowInPager(void* window, bool bShow);
86
void setWindowAlwaysBelow(void* window);
97
void setWindowAlwaysAbove(void* window);
108
}

Framework/Renderer/Utils/macOS/MacOSWindowPlatform.mm

-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
#import <Foundation/Foundation.h>
33
#import <Cocoa/Cocoa.h>
44

5-
void UImGui::MacOSWindow::setShowWindowOnTaskbar(void* window, bool bShow)
6-
{
7-
id w = (id)window;
8-
}
9-
10-
void UImGui::MacOSWindow::setShowWindowInPager(void* window, bool bShow)
11-
{
12-
id w = (id)window;
13-
}
14-
155
void UImGui::MacOSWindow::setWindowAlwaysBelow(void* window)
166
{
177
id w = (id)window;

0 commit comments

Comments
 (0)