mirror of https://github.com/mgba-emu/mgba.git
Qt: Make window corners square on Windows 11 (fixes #3285)
This commit is contained in:
parent
16f7a05b1a
commit
9271198f64
1
CHANGES
1
CHANGES
|
@ -17,6 +17,7 @@ Other fixes:
|
|||
- Qt: Fix LCDC background priority/enable bit being mis-mapped in I/O view
|
||||
- Updater: Fix updating appimage across filesystems
|
||||
Misc:
|
||||
- Qt: Make window corners square on Windows 11 (fixes mgba.io/i/3285)
|
||||
- Switch: Add bilinear filtering option (closes mgba.io/i/3111)
|
||||
- Vita: Add imc0 and xmc0 mount point support
|
||||
|
||||
|
|
|
@ -387,6 +387,7 @@ set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CM
|
|||
|
||||
if(WIN32)
|
||||
set_target_properties(${BINARY_NAME}-qt PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
|
||||
target_link_libraries(${BINARY_NAME}-qt dwmapi)
|
||||
if(NOT MSVC)
|
||||
target_link_libraries(${BINARY_NAME}-qt -municode)
|
||||
endif()
|
||||
|
@ -402,7 +403,7 @@ if(QT_STATIC)
|
|||
if(CMAKE_CROSSCOMPILING)
|
||||
set(QWINDOWS_DEPS ${QT}EventDispatcherSupport ${QT}FontDatabaseSupport ${QT}ThemeSupport ${QT}WindowsUIAutomationSupport)
|
||||
endif()
|
||||
list(APPEND QT_LIBRARIES ${QT}::QWindowsIntegrationPlugin ${QWINDOWS_DEPS} amstrmid dwmapi uxtheme imm32 -static-libgcc -static-libstdc++)
|
||||
list(APPEND QT_LIBRARIES ${QT}::QWindowsIntegrationPlugin ${QWINDOWS_DEPS} amstrmid uxtheme imm32 -static-libgcc -static-libstdc++)
|
||||
set_target_properties(${QT}::Core PROPERTIES INTERFACE_LINK_LIBRARIES "${QTPCRE};version;winmm;ssl;crypto;ws2_32;iphlpapi;crypt32;userenv;netapi32;wtsapi32")
|
||||
set_target_properties(${QT}::Gui PROPERTIES INTERFACE_LINK_LIBRARIES ${OPENGL_LIBRARY} ${OPENGLES2_LIBRARY})
|
||||
elseif(APPLE)
|
||||
|
|
|
@ -14,6 +14,10 @@
|
|||
#include <QScreen>
|
||||
#include <QWindow>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <dwmapi.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_SQLITE3
|
||||
#include "ArchiveInspector.h"
|
||||
#include "library/LibraryController.h"
|
||||
|
@ -745,6 +749,11 @@ void Window::showEvent(QShowEvent* event) {
|
|||
return;
|
||||
}
|
||||
m_wasOpened = true;
|
||||
#ifdef Q_OS_WIN
|
||||
HWND hwnd = reinterpret_cast<HWND>(winId());
|
||||
DWM_WINDOW_CORNER_PREFERENCE cornerPref = DWMWCP_DONOTROUND;
|
||||
DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, &cornerPref, sizeof(cornerPref));
|
||||
#endif
|
||||
if (m_initialSize.isValid()) {
|
||||
resizeFrame(m_initialSize);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue