Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-24 07:40:17 +01:00
Code Releases Wiki Activity

impr: Remove duplicate window name from macOS title bar

Browse Source
This commit is contained in:
WerWolv 2023-12-30 23:52:25 +01:00
parent 9c386e949d
commit b76e7ff678
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libimhex/include/hex/helpers/utils_macos.hpp
View File

@ -2,6 +2,8 @@
#if defined(OS_MACOS)
struct GLFWwindow;
extern "C" {
void errorMessageMacos(const char *message);
@ -9,6 +11,8 @@
bool isMacosSystemDarkModeEnabled();
float getBackingScaleFactor();
void setupMacosWindowStyle(GLFWwindow *window);
}
#endif

11
lib/libimhex/source/helpers/utils_macos.m
View File

@ -9,7 +9,11 @@
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
#define GLFW_EXPOSE_NATIVE_COCOA
#include <GLFW/glfw3.h>
#include <GLFW/glfw3native.h>
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
@ -40,6 +44,11 @@
return [[NSScreen mainScreen] backingScaleFactor];
}
void setupMacosWindowStyle(GLFWwindow *window) {
NSWindow* cocoaWindow = glfwGetCocoaWindow(window);
cocoaWindow.titleVisibility = NSWindowTitleHidden;
}
@interface HexDocument : NSDocument
@end

6
main/gui/source/window/macos_window.cpp
View File

@ -3,13 +3,11 @@
#if defined(OS_MACOS)
#include <hex/api/imhex_api.hpp>
#include <hex/api/content_registry.hpp>
#include <hex/api/event_manager.hpp>
#include <hex/helpers/utils_macos.hpp>
#include <hex/helpers/logger.hpp>
#include <nlohmann/json.hpp>
#include <cstdio>
#include <unistd.h>
@ -53,12 +51,16 @@ namespace hex {
if (themeFollowSystem)
EventOSThemeChanged::post();
setupMacosWindowStyle(m_window);
}
void Window::beginNativeWindowFrame() {
}
void Window::endNativeWindowFrame() {
}
}

4
main/gui/source/window/window.cpp
View File

@ -814,9 +814,9 @@ namespace hex {
continue;
const auto openViewCount = std::ranges::count_if(ContentRegistry::Views::impl::getEntries(), [](const auto &entry) {
const auto &[unlocalizedName, view] = entry;
const auto &[unlocalizedName, openView] = entry;
return view->hasViewMenuItemEntry() && view->shouldProcess();
return openView->hasViewMenuItemEntry() && openView->shouldProcess();
});
ImGuiWindowClass windowClass = {};