From 9c337394a15ab1c9a05173e93e481e37bf43036f Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Tue, 11 Aug 2026 06:59:41 +0200
Subject: [PATCH] cleanup

---
 CMakeLists.txt                                         | 4 ++--
 cmake/FindVCredistRuntime.cmake                        | 4 +---
 cockatrice/src/interface/widgets/tabs/tab_supervisor.h | 8 ++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 108e94da7..06d1c4483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,7 @@ if(UNIX)
       endif()
     endif()
   endif()
-elseif(WIN32) # Windows, including 64 bit
+elseif(WIN32) # Windows (including 64bit)
   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE})
 endif()
 
@@ -289,7 +289,7 @@ if(UNIX)
       set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
     endif()
   endif()
-elseif(WIN32) # Windows, including 64 bit
+elseif(WIN32) # Windows (including 64bit)
   set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR})
   if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(x64)")
     set(TRICE_IS_64_BIT 1)
diff --git a/cmake/FindVCredistRuntime.cmake b/cmake/FindVCredistRuntime.cmake
index 0889ca66e..4612008ae 100644
--- a/cmake/FindVCredistRuntime.cmake
+++ b/cmake/FindVCredistRuntime.cmake
@@ -7,9 +7,7 @@ if(WIN32) # Windows (including 64bit)
     set(REDIST_ARCH x64)
   endif()
 
-  #  <VS 2017 uses vcredist_ARCH.exe
-  # >=VS 2017 uses vc_redist.ARCH.exe
-  set(REDIST_FILE_NAMES vcredist_${REDIST_ARCH}.exe vc_redist.${REDIST_ARCH}.exe)
+  set(REDIST_FILE_NAMES vc_redist.${REDIST_ARCH}.exe)
 
   set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
   include(InstallRequiredSystemLibraries)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
index 5d349e18c..d3c147138 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@@ -21,6 +21,7 @@
 #include <QAbstractButton>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QProxyStyle>
 #include <QTabWidget>
 
 class TabCardArtRules;
@@ -51,6 +52,13 @@ class ServerInfo_User;
 class GameReplay;
 class DeckList;
 
+class MacOSTabFixStyle : public QProxyStyle
+{
+    Q_OBJECT
+public:
+    QRect subElementRect(SubElement, const QStyleOption *, const QWidget *) const override;
+};
+
 class CloseButton : public QAbstractButton
 {
     Q_OBJECT