From fa6fd4e89e46ede5b412642a73aa09e7d278270b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 6 Apr 2016 09:44:35 +0000
Subject: [PATCH] CtrlLib: ArrayCtrl: SpanWideCells

git-svn-id: svn://ultimatepp.org/upp/trunk@9672 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/ArrayCtrl.cpp | 44 +++++++++++++++++++++++++-----------
 uppsrc/CtrlLib/ArrayCtrl.h   |  4 ++++
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index 31eb06578..8038db18f 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -819,6 +819,19 @@ const Display& ArrayCtrl::GetCellInfo(int i, int j, bool f0,
 	return GetDisplay(i, j);
 }
 
+void ArrayCtrl::SpanWideCell(const Display& d, const Value& q, int cm, int& cw, Rect& r, int i, int& j)
+{
+	int cx = d.GetStdSize(q).cx;
+	while(cx > r.Width() - 2 * cm && j + 1 < column.GetCount()) {
+		Value v = GetConvertedColumn(i, j + 1);
+		if(!IsNull(v))
+			break;
+		j++;
+		cw += header.GetTabWidth(j);
+		r.right = r.left + cw - vertgrid + (j == column.GetCount() - 1);
+	}
+}
+
 Size  ArrayCtrl::DoPaint(Draw& w, bool sample) {
 	LTIMING("Paint");
 	SyncColumnsPos();
@@ -854,12 +867,15 @@ Size  ArrayCtrl::DoPaint(Draw& w, bool sample) {
 							cm = header.Tab(j).GetMargin();
 						if(x > size.cx) break;
 						r.left = x;
-						r.right = x + cw - vertgrid + (j == column.GetCount() - 1);
+						r.right = x + cw - vertgrid + (jj == column.GetCount() - 1);
 						dword st;
 						Color fg, bg;
 						Value q;
 						const Display& d = GetCellInfo(i, jj, hasfocus0, q, fg, bg, st);
 						if(sample || w.IsPainting(r)) {
+							if(spanwidecells)
+								SpanWideCell(d, q, cm, cw, r, i, j);
+							
 							if(cw < 2 * cm || editmode && i == cursor && column[jj].edit)
 								d.PaintBackground(w, r, q, fg, bg, st);
 							else {
@@ -868,7 +884,7 @@ Size  ArrayCtrl::DoPaint(Draw& w, bool sample) {
 								r.right -= cm;
 								d.PaintBackground(w, RectC(r.right, r.top, cm, r.Height()), q, fg, bg, st);
 								w.Clip(r);
-								GetDisplay(i, jj).Paint(w, r, q, fg, bg, st);
+								d.Paint(w, r, q, fg, bg, st);
 								w.End();
 							}
 						}
@@ -1665,20 +1681,21 @@ void ArrayCtrl::SyncInfo()
 		c.y = GetLineAt(p.y + sb);
 		if(c.y >= 0) {
 			for(c.x = 0; c.x < column.GetCount(); c.x++) {
-				Rect r = GetCellRect(c.y, c.x);
-				if(r.Contains(p)) {
-					if(!IsCtrl(c.y, c.x)) {
-						int cm = column[c.x].margin;
-						if(cm < 0)
-							cm = header.Tab(header.FindIndex(c.x)).GetMargin();
-						dword st;
-						Color fg, bg;
-						Value q;
-						const Display& d = GetCellInfo(c.y, c.x, HasFocusDeep(), q, fg, bg, st);
+				if(!IsCtrl(c.y, c.x)) {
+					Rect r = GetCellRect(c.y, c.x);
+					int cm = column[c.x].margin;
+					if(cm < 0)
+						cm = header.Tab(header.FindIndex(c.x)).GetMargin();
+					dword st;
+					Color fg, bg;
+					Value q;
+					const Display& d = GetCellInfo(c.y, c.x, HasFocusDeep(), q, fg, bg, st);
+					int cw = r.Width();
+					SpanWideCell(d, q, cm, cw, r, c.y, c.x);
+					if(r.Contains(p)) {
 						info.Set(this, r, q, &d, fg, bg, st, cm);
 						return;
 					}
-					break;
 				}
 			}
 		}
@@ -2663,6 +2680,7 @@ void ArrayCtrl::Reset() {
 	allsorting = false;
 	acceptingrow = 0;
 	columnsortfindkey = false;
+	spanwidecells = false;
 	linecy = Draw::GetStdFontCy();
 	Clear();
 	sb.SetLine(linecy);
diff --git a/uppsrc/CtrlLib/ArrayCtrl.h b/uppsrc/CtrlLib/ArrayCtrl.h
index bbff77d2e..3f93f3eb6 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.h
+++ b/uppsrc/CtrlLib/ArrayCtrl.h
@@ -239,6 +239,7 @@ private:
 	bool  nobg:1;
 	bool  focussetcursor:1;
 	bool  allsorting:1;
+	bool  spanwidecells:1;
 
 	mutable bool  selectiondirty:1;
 
@@ -299,6 +300,7 @@ private:
 	const Display& GetCellInfo(int i, int j, bool f0, Value& v, Color& fg, Color& bg, dword& st);
 	Ctrl&  SetCtrl(int i, int j, Ctrl *newctrl, bool owned, bool value);
 	Size   DoPaint(Draw& w, bool sample);
+	void   SpanWideCell(const Display& d, const Value& q, int cm, int& cw, Rect& r, int i, int& j);
 
 	bool   TestKey(int i, int key);
 
@@ -687,6 +689,8 @@ public:
 
 	ArrayCtrl& CursorOverride(const Image& arrow)             { cursor_override = arrow; return *this; }
 	ArrayCtrl& NoCursorOverride()                             { return CursorOverride(Null); }
+	
+	ArrayCtrl& SpanWideCells(bool b = true)                   { spanwidecells = b; Refresh(); return *this; }
 
 	void Reset();