Merge branch 'dev' of https://gitee.com/czyt1988/SARibbon into dev

czyt1988 · Dec 28, 2023 · bc9a3b2 · bc9a3b2
2 parents 0ad92cc + 778cbd0
commit bc9a3b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(SARIBBON_VERSION_MAJOR 1)
-set(SARIBBON_VERSION_MINOR 0)
-set(SARIBBON_VERSION_PATCH 7)
+set(SARIBBON_VERSION_MINOR 1)
+set(SARIBBON_VERSION_PATCH 1)
 set(SARIBBON_VERSION "${SARIBBON_VERSION_MAJOR}.${SARIBBON_VERSION_MINOR}.${SARIBBON_VERSION_PATCH}")
 project(SARibbon VERSION ${SARIBBON_VERSION} LANGUAGES CXX)
 

diff --git a/src/SARibbonBar/3rdparty/framelesshelper/include/FramelessHelper/Core/framelesshelper_qt.h b/src/SARibbonBar/3rdparty/framelesshelper/include/FramelessHelper/Core/framelesshelper_qt.h
@@ -1,4 +1,4 @@
-/*
+/*
  * MIT License
  *
  * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao)

diff --git a/src/SARibbonBar/SARibbonGlobal.h b/src/SARibbonBar/SARibbonGlobal.h
@@ -9,7 +9,9 @@
   @note My native language is not English, and most of the translation of documents is machine translation
 
   版本记录(change log):
-
+  - 2023-12-25 -> 1.1.1
+  修正了SARibbonBar的布局过程对窗体隐藏的判断方式，使得在窗口没显示时也能正确布局
+  
   - 2023-12-25 -> 1.1.0
   修正了尺寸刷新的问题，在首次显示不会出现控件跳动的状态
   修正了一些问题
@@ -119,7 +121,7 @@
  * @def ribbon的数字版本 MAJ.MIN.{PAT}
  */
 #ifndef SA_RIBBON_BAR_VERSION_PAT
-#define SA_RIBBON_BAR_VERSION_PAT 0
+#define SA_RIBBON_BAR_VERSION_PAT 1
 #endif
 
 #ifndef SA_RIBBON_BAR_NO_EXPORT
@@ -178,6 +180,8 @@ enum class SARibbonAlignment
  */
 // #define SARIBBON_USE_3RDPARTY_FRAMELESSHELPER 0
 
+
+
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
 #ifndef SA_FONTMETRICS_WIDTH
 #define SA_FONTMETRICS_WIDTH(fm, str) fm.horizontalAdvance(str)