Skip to content

Commit

Permalink
修复SARibbonMainWindow::setRibbonBar后导致覆盖systembar的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@czyt1988
czyt1988 committed Sep 12, 2024
1 parent b34c61d commit d4183e7
Show file tree
Hide file tree
Showing 2 changed files with 194 additions and 190 deletions.
2 changes: 1 addition & 1 deletion src/SARibbonBar/3rdparty/qwindowkit
Submodule qwindowkit updated 35 files
+1 −1 CMakeLists.txt
+11 −26 README.md
+ − docs/images/vs-guide-1.png
+ − docs/images/vs-guide-2.png
+ − docs/images/vs-guide-3.png
+0 −15 docs/visual-studio-guide.md
+1 −2 examples/mainwindow/main.cpp
+11 −16 examples/mainwindow/mainwindow.cpp
+1 −1 examples/qml/main.qml
+1 −1 qmsetup
+0 −6 share/install.cmake
+0 −2 share/qmake/QWKCore.pri.in
+0 −2 share/qmake/QWKQuick.pri.in
+0 −2 share/qmake/QWKWidgets.pri.in
+29 −7 src/CMakeLists.txt
+4 −4 src/QWindowKitConfig.cmake.in
+0 −1 src/core/CMakeLists.txt
+38 −11 src/core/contexts/abstractwindowcontext.cpp
+3 −22 src/core/contexts/abstractwindowcontext_p.h
+4 −5 src/core/contexts/cocoawindowcontext.mm
+2 −4 src/core/contexts/qtwindowcontext.cpp
+122 −314 src/core/contexts/win32windowcontext.cpp
+0 −2 src/core/contexts/win32windowcontext_p.h
+8 −0 src/core/qwindowkit_windows.h
+0 −43 src/core/qwkglobal.cpp
+0 −4 src/core/qwkglobal_p.h
+0 −4 src/core/windowagentbase.cpp
+1 −0 src/core/windowitemdelegate_p.h
+7 −0 src/quick/quickitemdelegate.cpp
+1 −0 src/quick/quickitemdelegate_p.h
+2 −9 src/quick/quickwindowagent.cpp
+1 −6 src/quick/quickwindowagent.h
+15 −0 src/widgets/widgetitemdelegate.cpp
+1 −0 src/widgets/widgetitemdelegate_p.h
+4 −16 src/widgets/widgetwindowagent_win.cpp
Loading

0 comments on commit d4183e7

Please sign in to comment.