fix: label covered by highlight mark when mark_text empty and hilited…

…_mark_color not transparent
rime · Dec 16, 2023 · b9ce276 · b9ce276
1 parent 0005610
commit b9ce276
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/WeaselUI/FullScreenLayout.cpp b/WeaselUI/FullScreenLayout.cpp
@@ -31,7 +31,10 @@ void weasel::FullScreenLayout::DoLayout(CDCHandle dc, PDWR pDWR)
 		if (!_style.mark_text.empty() && (_style.hilited_mark_color & 0xff000000))
 		{
 			CSize sg;
-			GetTextSizeDW(_style.mark_text, _style.mark_text.length(), pDWR->pTextFormat, pDWR, &sg);
+			if(_style.mark_text.empty())
+				GetTextSizeDW(L"|", 1, pDWR->pTextFormat, pDWR, &sg);
+			else
+				GetTextSizeDW(_style.mark_text, _style.mark_text.length(), pDWR->pTextFormat, pDWR, &sg);
 			MARK_WIDTH = sg.cx;
 			MARK_HEIGHT = sg.cy;
 			MARK_GAP = MARK_WIDTH + 4;

diff --git a/WeaselUI/HorizontalLayout.cpp b/WeaselUI/HorizontalLayout.cpp
@@ -22,7 +22,7 @@ void HorizontalLayout::DoLayout(CDCHandle dc, PDWR pDWR )
 		MARK_HEIGHT = sg.cy;
 		MARK_GAP = MARK_WIDTH + 4;
 	}
-	int base_offset =  ((_style.hilited_mark_color & 0xff000000) && !_style.mark_text.empty()) ? MARK_GAP : 0;
+	int base_offset =  ((_style.hilited_mark_color & 0xff000000)) ? MARK_GAP : 0;
 
 	// calc page indicator 
 	CSize pgszl, pgszr;

diff --git a/WeaselUI/VHorizontalLayout.cpp b/WeaselUI/VHorizontalLayout.cpp
@@ -28,7 +28,7 @@ void VHorizontalLayout::DoLayout(CDCHandle dc, PDWR pDWR )
 		MARK_HEIGHT = sg.cy;
 		MARK_GAP = MARK_HEIGHT + 4;
 	}
-	int base_offset =  ((_style.hilited_mark_color & 0xff000000) && !_style.mark_text.empty()) ? MARK_GAP : 0;
+	int base_offset =  ((_style.hilited_mark_color & 0xff000000)) ? MARK_GAP : 0;
 
 	// calc page indicator 
 	CSize pgszl, pgszr;
@@ -237,7 +237,7 @@ void VHorizontalLayout::DoLayoutWithWrap(CDCHandle dc, PDWR pDWR)
 		MARK_HEIGHT = sg.cy;
 		MARK_GAP = MARK_HEIGHT + 4;
 	}
-	int base_offset =  ((_style.hilited_mark_color & 0xff000000) && !_style.mark_text.empty()) ? MARK_GAP : 0;
+	int base_offset =  ((_style.hilited_mark_color & 0xff000000)) ? MARK_GAP : 0;
 
 	// calc page indicator 
 	CSize pgszl, pgszr;

diff --git a/WeaselUI/VerticalLayout.cpp b/WeaselUI/VerticalLayout.cpp
@@ -20,7 +20,7 @@ void weasel::VerticalLayout::DoLayout(CDCHandle dc, PDWR pDWR)
 		MARK_HEIGHT = sg.cy;
 		MARK_GAP = MARK_WIDTH + 4;
 	}
-	int base_offset =  ((_style.hilited_mark_color & 0xff000000) && !_style.mark_text.empty()) ? MARK_GAP : 0;
+	int base_offset =  ((_style.hilited_mark_color & 0xff000000)) ? MARK_GAP : 0;
 
 	// calc page indicator 
 	CSize pgszl, pgszr;