Commit: 39faea391e72bbedf1d6278827cfb4708597dace - turbobadger (git)

Small footprint UI library for hardware accelerated games & applications

Commit MetaInfo

• Revision: 39faea391e72bbedf1d6278827cfb4708597dace (tree)
• Time: 2016-11-06 04:38:51
• Author: Emil Segerås <emilsegers@gmai...>
• Commiter: Emil Segerås

Log Message

Moved paint related arguments into TBPaintProps.

Change Summary

• modified: src/tb/tb_style_edit.cpp
• modified: src/tb/tb_style_edit.h
• modified: src/tb/tb_style_edit_content.cpp
• modified: src/tb/tb_style_edit_content.h

Incremental Difference

--- a/src/tb/tb_style_edit.cpp
+++ b/src/tb/tb_style_edit.cpp
@@ -657,9 +657,7 @@ TBTextProps::Data *TBTextProps::Push()
 			return nullptr;
 	}
 	Data *next = list.Get(next_index++);
-	next->font_desc = data->font_desc;
-	next->text_color = data->text_color;
-	next->underline = data->underline;
+	*next = *data;
 	data = next;
 	return data;
 }
@@ -1128,10 +1126,16 @@ void TBBlock::BuildSelectionRegion(int32 translate_x, int32 translate_y, TBTextP
 	if (!styledit->selection.IsBlockSelected(this))
 		return;
 
+	TBPaintProps paint_props;
+	paint_props.block = this;
+	paint_props.props = props;
+	paint_props.translate_x = translate_x;
+	paint_props.translate_y = translate_y + ypos;
+
 	TBTextFragment *fragment = fragments.GetFirst();
 	while (fragment)
 	{
-		fragment->BuildSelectionRegion(this, translate_x, translate_y + ypos, props, bg_region, fg_region);
+		fragment->BuildSelectionRegion(&paint_props, bg_region, fg_region);
 		fragment = fragment->GetNext();
 	}
 }
@@ -1140,10 +1144,16 @@ void TBBlock::Paint(int32 translate_x, int32 translate_y, TBTextProps *props)
 {
 	TMPDEBUG(styledit->listener->DrawRect(TBRect(translate_x, translate_y + ypos, styledit->layout_width, height), TBColor(255, 200, 0, 128)));
 
+	TBPaintProps paint_props;
+	paint_props.block = this;
+	paint_props.props = props;
+	paint_props.translate_x = translate_x;
+	paint_props.translate_y = translate_y + ypos;
+
 	TBTextFragment *fragment = fragments.GetFirst();
 	while (fragment)
 	{
-		fragment->Paint(this, translate_x, translate_y + ypos, props);
+		fragment->Paint(&paint_props);
 		fragment = fragment->GetNext();
 	}
 }
@@ -1170,15 +1180,15 @@ void TBTextFragment::UpdateContentPos(const TBBlock *block)
 		content->UpdatePos(block, xpos, ypos + block->ypos);
 }
 
-void TBTextFragment::BuildSelectionRegion(const TBBlock *block, int32 translate_x, int32 translate_y, TBTextProps *props,
-	TBRegion &bg_region, TBRegion &fg_region)
+void TBTextFragment::BuildSelectionRegion(const TBPaintProps *props, TBRegion &bg_region, TBRegion &fg_region)
 {
+	const TBBlock *block = props->block;
 	if (!block->styledit->selection.IsFragmentSelected(block, this))
 		return;
 
-	int x = translate_x + xpos;
-	int y = translate_y + ypos;
-	TBFontFace *font = props->GetFont();
+	const int x = props->translate_x + xpos;
+	const int y = props->translate_y + ypos;
+	TBFontFace *font = props->props->GetFont();
 
 	if (content)
 	{
@@ -1201,18 +1211,19 @@ void TBTextFragment::BuildSelectionRegion(const TBBlock *block, int32 translate_
 	bg_region.IncludeRect(TBRect(x + s1x, y, s2x, GetHeight(block, font)));
 }
 
-void TBTextFragment::Paint(const TBBlock *block, int32 translate_x, int32 translate_y, TBTextProps *props)
+void TBTextFragment::Paint(const TBPaintProps *props)
 {
-	TBStyleEditListener *listener = block->styledit->listener;
+	TBStyleEditListener *listener = props->block->styledit->listener;
 
-	int x = translate_x + xpos;
-	int y = translate_y + ypos;
-	TBColor color = props->data->text_color;
-	TBFontFace *font = props->GetFont();
+	const int x = props->translate_x + xpos;
+	const int y = props->translate_y + ypos;
+	const TBColor color = props->props->data->text_color;
+	TBFontFace *font = props->props->GetFont();
+	TBBlock *block = props->block;
 
 	if (content)
 	{
-		content->Paint(block, this, translate_x, translate_y, props);
+		content->Paint(props, this);
 		return;
 	}
 	TMPDEBUG(listener->DrawRect(TBRect(x, y, GetWidth(block, font), GetHeight(block, font)), TBColor(255, 255, 255, 128)));
@@ -1238,7 +1249,7 @@ void TBTextFragment::Paint(const TBBlock *block, int32 translate_x, int32 transl
 	else if (!IsTab() && !IsBreak() && !IsSpace())
 		listener->DrawString(x, y, font, color, Str(block), len);
 
-	if (props->data->underline)
+	if (props->props->data->underline)
 	{
 		int line_h = font->GetHeight() / 16;
 		line_h = MAX(line_h, 1);

--- a/src/tb/tb_style_edit.h
+++ b/src/tb/tb_style_edit.h
@@ -166,6 +166,17 @@ public:
 	Data *data;
 };
 
+/** TBPaintProps holds paint related data during paint of TBStyleEdit. */
+
+class TBPaintProps
+{
+public:
+	TBBlock *block;
+	TBTextProps *props;
+	int32 translate_x;
+	int32 translate_y;
+};
+
 /** A block of text (a line, that might be wrapped) */
 
 class TBBlock : public TBLinkOf<TBBlock>
@@ -280,9 +291,8 @@ public:
 
 	void UpdateContentPos(const TBBlock *block);
 
-	void BuildSelectionRegion(const TBBlock *block, int32 translate_x, int32 translate_y, TBTextProps *props,
-		TBRegion &bg_region, TBRegion &fg_region);
-	void Paint(const TBBlock *block, int32 translate_x, int32 translate_y, TBTextProps *props);
+	void BuildSelectionRegion(const TBPaintProps *props, TBRegion &bg_region, TBRegion &fg_region);
+	void Paint(const TBPaintProps *props);
 	void Click(const TBBlock *block, int button, uint32 modifierkeys);
 
 	bool IsText() const					{ return !IsEmbedded(); }
@@ -308,8 +318,7 @@ public:
 public:
 	int16 xpos, ypos;
 	uint16 ofs, len;
-	uint16 line_ypos;
-	uint16 line_height;
+	uint16 line_ypos, line_height;
 	union {
 		struct {
 			uint32 is_break			: 1;

--- a/src/tb/tb_style_edit_content.cpp
+++ b/src/tb/tb_style_edit_content.cpp
@@ -52,16 +52,16 @@ TBTextFragmentContentHR::TBTextFragmentContentHR(int32 width_in_percent, int32 h
 {
 }
 
-void TBTextFragmentContentHR::Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props)
+void TBTextFragmentContentHR::Paint(const TBPaintProps *props, TBTextFragment *fragment)
 {
-	int x = translate_x + fragment->xpos;
-	int y = translate_y + fragment->ypos;
+	int x = props->translate_x + fragment->xpos;
+	int y = props->translate_y + fragment->ypos;
 
-	int w = block->styledit->layout_width * width_in_percent / 100;
-	x += (block->styledit->layout_width - w) / 2;
+	int w = props->block->styledit->layout_width * width_in_percent / 100;
+	x += (props->block->styledit->layout_width - w) / 2;
 
-	TBStyleEditListener *listener = block->styledit->listener;
-	listener->DrawRectFill(TBRect(x, y, w, height), props->data->text_color);
+	TBStyleEditListener *listener = props->block->styledit->listener;
+	listener->DrawRectFill(TBRect(x, y, w, height), props->props->data->text_color);
 }
 
 int32 TBTextFragmentContentHR::GetWidth(const TBBlock *block, TBFontFace *font, TBTextFragment *fragment) { return Max(block->styledit->layout_width, 0); }
@@ -70,21 +70,21 @@ int32 TBTextFragmentContentHR::GetHeight(const TBBlock *block, TBFontFace *font,
 
 // ============================================================================
 
-void TBTextFragmentContentUnderline::Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props)
+void TBTextFragmentContentUnderline::Paint(const TBPaintProps *props, TBTextFragment *fragment)
 {
-	if (TBTextProps::Data *data = props->Push())
+	if (TBTextProps::Data *data = props->props->Push())
 		data->underline = true;
 }
 
-void TBTextFragmentContentTextColor::Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props)
+void TBTextFragmentContentTextColor::Paint(const TBPaintProps *props, TBTextFragment *fragment)
 {
-	if (TBTextProps::Data *data = props->Push())
+	if (TBTextProps::Data *data = props->props->Push())
 		data->text_color = color;
 }
 
-void TBTextFragmentContentStylePop::Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props)
+void TBTextFragmentContentStylePop::Paint(const TBPaintProps *props, TBTextFragment *fragment)
 {
-	props->Pop();
+	props->props->Pop();
 }
 
 } // namespace tb

--- a/src/tb/tb_style_edit_content.h
+++ b/src/tb/tb_style_edit_content.h
@@ -22,7 +22,7 @@ public:
 	/** Update the position of the content, relative to the first line of text (no scrolling applied). */
 	virtual void UpdatePos(const TBBlock *block, int x, int y) {}
 
-	virtual void Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props) {}
+	virtual void Paint(const TBPaintProps *props, TBTextFragment *fragment) {}
 	virtual void Click(const TBBlock *block, TBTextFragment *fragment, int button, uint32 modifierkeys) {}
 	virtual int32 GetWidth(const TBBlock *block, TBFontFace *font, TBTextFragment *fragment) { return 0; }
 	virtual int32 GetHeight(const TBBlock *block, TBFontFace *font, TBTextFragment *fragment) { return 0; }
@@ -41,7 +41,7 @@ class TBTextFragmentContentHR : public TBTextFragmentContent
 public:
 	TBTextFragmentContentHR(int32 width_in_percent, int32 height);
 
-	virtual void Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props);
+	virtual void Paint(const TBPaintProps *props, TBTextFragment *fragment);
 	virtual int32 GetWidth(const TBBlock *block, TBFontFace *font, TBTextFragment *fragment);
 	virtual int32 GetHeight(const TBBlock *block, TBFontFace *font, TBTextFragment *fragment);
 private:
@@ -54,7 +54,7 @@ class TBTextFragmentContentUnderline : public TBTextFragmentContent
 {
 public:
 	TBTextFragmentContentUnderline() {}
-	virtual void Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props);
+	virtual void Paint(const TBPaintProps *props, TBTextFragment *fragment);
 	virtual bool GetAllowBreakBefore(const TBBlock *block) { return true; }
 	virtual bool GetAllowBreakAfter(const TBBlock *block) { return false; }
 };
@@ -66,7 +66,7 @@ class TBTextFragmentContentTextColor : public TBTextFragmentContent
 public:
 	TBColor color;
 	TBTextFragmentContentTextColor(const TBColor &color) : color(color) {}
-	virtual void Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props);
+	virtual void Paint(const TBPaintProps *props, TBTextFragment *fragment);
 	virtual bool GetAllowBreakBefore(const TBBlock *block) { return true; }
 	virtual bool GetAllowBreakAfter(const TBBlock *block) { return false; }
 };
@@ -76,7 +76,7 @@ public:
 class TBTextFragmentContentStylePop : public TBTextFragmentContent
 {
 public:
-	virtual void Paint(const TBBlock *block, TBTextFragment *fragment, int32 translate_x, int32 translate_y, TBTextProps *props);
+	virtual void Paint(const TBPaintProps *props, TBTextFragment *fragment);
 	virtual bool GetAllowBreakBefore(const TBBlock *block) { return false; }
 	virtual bool GetAllowBreakAfter(const TBBlock *block) { return true; }
 };