modify to support displaying any color of the backgroud in c_label in…

…stead of being consistent with the m_parent c_wnd (idea4good#45)
hwgao · Sep 21, 2020 · 6aeadc8 · 6aeadc8
1 parent 03fd297
commit 6aeadc8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/workspace/widgets_include/label.h b/workspace/widgets_include/label.h
@@ -16,12 +16,13 @@ class c_label : public c_wnd
 	virtual void on_paint()
 	{
 		c_rect rect;
+		unsigned int bg_color = m_bg_color ? m_bg_color \
+			: m_parent->get_bg_color();
 		get_screen_rect(rect);
-
 		if (m_str)
 		{
-			m_surface->fill_rect(rect.m_left, rect.m_top, rect.m_right, rect.m_bottom, m_parent->get_bg_color(), m_z_order);
-			c_word::draw_string_in_rect(m_surface, m_z_order, m_str, rect, m_font_type, m_font_color, m_parent->get_bg_color(), ALIGN_LEFT | ALIGN_VCENTER);
+			m_surface->fill_rect(rect.m_left, rect.m_top, rect.m_right, rect.m_bottom, bg_color, m_z_order);
+			c_word::draw_string_in_rect(m_surface, m_z_order, m_str, rect, m_font_type, m_font_color, bg_color, ALIGN_LEFT | ALIGN_VCENTER);
 		}
 	}
 protected: