Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 965e055

Browse files
committed
Mac fixes
1 parent 3713d75 commit 965e055

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/Ramses.pro

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ SOURCES += \
8383
rammanagerwidgets/shotmanagerwidget.cpp \
8484
rammanagerwidgets/statemanagerwidget.cpp \
8585
rammanagerwidgets/stepmanagerwidget.cpp \
86+
rammanagerwidgets/usermanagerwidget.cpp \
8687
ramobjectdelegates/ramobjectdelegate.cpp \
8788
ramobjectmodels/dbtablemodel.cpp \
8889
ramobjectmodels/ramabstractdatamodel.cpp \
@@ -150,7 +151,6 @@ SOURCES += \
150151
rammanagerwidgets/templateassetgroupmanagerwidget.cpp \
151152
rammanagerwidgets/templatestepmanagerwidget.cpp \
152153
docks/timelinewidget.cpp \
153-
rammanagerwidgets/usermanagerwidget.cpp \
154154
ramfilemetadatamanager.cpp \
155155
ramnamemanager.cpp \
156156
ramobjects/ramabstractobject.cpp \
@@ -475,14 +475,6 @@ win* {
475475
QMAKE_CXXFLAGS += -Wdeprecated \
476476
-Wdeprecated-copy
477477
} else:macx {
478-
479-
# ==== FRAMELESS WINDOW ====
480-
# Only include / compile these files on OS X
481-
OBJECTIVE_SOURCES += \
482-
OSUtils/mac/OSXHideTitleBar.mm
483-
HEADERS +=\
484-
OSUtils/mac/OSXHideTitleBar.h
485-
486478
# icon
487479
ICON = resources/icons/ramses.icns
488480
CONFIG += sdk_no_version_check

src/duqf-app/duui.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ void DuUI::setupLayout(QLayout *l, int margin, int spacing)
290290

291291
void DuUI::setDarkTitleBar(QWidget *widget)
292292
{
293-
auto hwnd = reinterpret_cast<HWND>(widget->winId());
294293
#ifdef Q_OS_WIN
294+
auto hwnd = reinterpret_cast<HWND>(widget->winId());
295295
HMODULE hUxtheme = LoadLibraryExW(L"uxtheme.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
296296
HMODULE hUser32 = GetModuleHandleW(L"user32.dll");
297297
fnAllowDarkModeForWindow AllowDarkModeForWindow
@@ -310,5 +310,7 @@ void DuUI::setDarkTitleBar(QWidget *widget)
310310
sizeof(dark)
311311
};
312312
SetWindowCompositionAttribute(hwnd, &data);
313+
#else
314+
Q_UNUSED(widget)
313315
#endif
314316
}

0 commit comments

Comments
 (0)