fixed: hilited mark covered by hilited_candidate_back_color, when mar…

…k_text empty and hilited_mark_color not transparent
rime · Aug 23, 2023 · 83bf4a1 · 83bf4a1
1 parent db79168
commit 83bf4a1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/WeaselUI/WeaselPanel.cpp b/WeaselUI/WeaselPanel.cpp
@@ -635,6 +635,7 @@ bool WeaselPanel::_DrawCandidates(CDCHandle &dc, bool back)
 				ReconfigRoundInfo(rd, m_ctx.cinfo.highlighted, m_candidateCount);
 			}
 			rect.InflateRect(m_style.hilite_padding_x, m_style.hilite_padding_y);
+			_HighlightText(dc, rect, m_style.hilited_candidate_back_color, m_style.hilited_candidate_shadow_color, m_style.round_corner, bkType, rd, m_style.hilited_candidate_border_color);
 			if (m_style.mark_text.empty() && COLORNOTTRANSPARENT(m_style.hilited_mark_color))
 			{
 				BYTE r = GetRValue(m_style.hilited_mark_color);
@@ -658,7 +659,6 @@ bool WeaselPanel::_DrawCandidates(CDCHandle &dc, bool back)
 					g_back.FillPath(&mk_brush, &mk_path);
 				}
 			}
-			_HighlightText(dc, rect, m_style.hilited_candidate_back_color, m_style.hilited_candidate_shadow_color, m_style.round_corner, bkType, rd, m_style.hilited_candidate_border_color);
 			drawn = true;
 		}
 	}