Skip to content

Commit 5f10e16

Browse files
MeychiMeychi
committed
Theming related improvements, new settings and fixes...
1 parent 21705ac commit 5f10e16

File tree

33 files changed

+318
-74
lines changed

33 files changed

+318
-74
lines changed

‎External/3rdParty/Aga-1.7/Aga.Controls/Tree/Input/ReorderColumnState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ReorderColumnState(TreeViewAdv tree, TreeColumn column, Point initialMous
4141
{
4242
_location = new Point(initialMouseLocation.X + Tree.OffsetX, 0);
4343
_dragOffset = tree.GetColumnX(column) - initialMouseLocation.X;
44-
_ghostImage = column.CreateGhostImage(new Rectangle(0, 0, column.Width, tree.ActualColumnHeaderHeight), tree.Font);
44+
_ghostImage = column.CreateGhostImage(new Rectangle(0, 0, column.Width, tree.ActualColumnHeaderHeight), tree.Font, tree.ForeColor);
4545
}
4646

4747
public override void KeyDown(KeyEventArgs args)

‎External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeColumn.cs

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -288,23 +288,22 @@ private static void CreateRenderers()
288288
}
289289
}
290290

291-
internal Bitmap CreateGhostImage(Rectangle bounds, Font font)
291+
internal Bitmap CreateGhostImage(Rectangle bounds, Font font, Color color)
292292
{
293293
Bitmap b = new Bitmap(bounds.Width, bounds.Height, PixelFormat.Format32bppArgb);
294294
Graphics gr = Graphics.FromImage(b);
295295
gr.FillRectangle(SystemBrushes.ControlDark, bounds);
296-
DrawContent(gr, bounds, font);
296+
DrawContent(gr, bounds, font, color);
297297
BitmapHelper.SetAlphaChanelValue(b, 150);
298298
return b;
299299
}
300300

301-
internal void Draw(Graphics gr, Rectangle bounds, Font font, bool pressed, bool hot)
301+
internal void Draw(Graphics gr, Rectangle bounds, Font font, bool pressed, bool hot, Color color)
302302
{
303-
DrawBackground(gr, bounds, pressed, hot);
304-
DrawContent(gr, bounds, font);
303+
DrawContent(gr, bounds, font, color);
305304
}
306305

307-
private void DrawContent(Graphics gr, Rectangle bounds, Font font)
306+
private void DrawContent(Graphics gr, Rectangle bounds, Font font, Color color)
308307
{
309308
Rectangle innerBounds = new Rectangle(bounds.X + HeaderLeftMargin, bounds.Y,
310309
bounds.Width - HeaderLeftMargin - HeaderRightMargin,
@@ -331,9 +330,9 @@ private void DrawContent(Graphics gr, Rectangle bounds, Font font)
331330
}
332331

333332
if (textSize.Width < maxTextSize.Width)
334-
TextRenderer.DrawText(gr, Header, font, innerBounds, SystemColors.ControlText, _baseHeaderFlags | TextFormatFlags.Left);
333+
TextRenderer.DrawText(gr, Header, font, innerBounds, color, _baseHeaderFlags | TextFormatFlags.Left);
335334
else
336-
TextRenderer.DrawText(gr, Header, font, innerBounds, SystemColors.ControlText, _headerFlags);
335+
TextRenderer.DrawText(gr, Header, font, innerBounds, color, _headerFlags);
337336
}
338337

339338
private void DrawSortMark(Graphics gr, Rectangle bounds, int x)
@@ -391,11 +390,20 @@ internal static void DrawBackground(Graphics gr, Rectangle bounds, bool pressed,
391390
}
392391
}
393392

394-
#endregion
393+
internal static void DrawCustomBackground(Graphics gr, Color back, Color fore, Rectangle bounds, bool pressed, bool hot)
394+
{
395+
gr.FillRectangle(new SolidBrush(back), bounds);
396+
Pen p1 = new Pen(fore);
397+
gr.DrawLine(p1, bounds.X, bounds.Y - 1, bounds.Right, bounds.Y - 1);
398+
gr.DrawLine(p1, bounds.Right - 1, bounds.Y + 3, bounds.Right - 1, bounds.Bottom - 4);
399+
gr.DrawLine(p1, bounds.X, bounds.Bottom, bounds.Right, bounds.Bottom);
400+
}
401+
402+
#endregion
395403

396-
#region Events
404+
#region Events
397405

398-
public event EventHandler HeaderChanged;
406+
public event EventHandler HeaderChanged;
399407
private void OnHeaderChanged()
400408
{
401409
if (HeaderChanged != null)

‎External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeViewAdv.Draw.cs

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public void AutoSizeColumn(TreeColumn column)
4040
private void CreatePens()
4141
{
4242
CreateLinePen();
43-
CreateMarkPen();
43+
CreateMarkPen();
44+
CreateLine2Pen();
4445
}
4546

4647
private void CreateMarkPen()
@@ -61,6 +62,11 @@ private void CreateLinePen()
6162
_linePen.DashStyle = DashStyle.Dot;
6263
}
6364

65+
private void CreateLine2Pen()
66+
{
67+
_line2Pen = new Pen(_lineColor);
68+
}
69+
6470
protected override void OnPaintBackground(PaintEventArgs pevent)
6571
{
6672
if (this.BackgroundPaintMode == Tree.BackgroundPaintMode.Gradiant)
@@ -90,7 +96,7 @@ protected override void OnPaint(PaintEventArgs e)
9096

9197
if (UseColumns)
9298
{
93-
DrawColumnHeaders(e.Graphics);
99+
DrawColumnHeaders(e.Graphics, this.ColumnHeaderBackColor, this.ColumnHeaderBorderColor, this.ColumnHeaderTextColor);
94100
y += ActualColumnHeaderHeight;
95101
if (Columns.Count == 0 || e.ClipRectangle.Height + e.ClipRectangle.Top <= y)
96102
return;
@@ -169,7 +175,7 @@ private void DrawRow(PaintEventArgs e, ref DrawContext context, int row, Rectang
169175
}
170176

171177
if ((GridLineStyle & GridLineStyle.Horizontal) == GridLineStyle.Horizontal)
172-
e.Graphics.DrawLine(SystemPens.InactiveBorder, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
178+
e.Graphics.DrawLine(_line2Pen, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
173179

174180
if (ShowLines)
175181
DrawLines(e.Graphics, node, rowRect);
@@ -185,18 +191,21 @@ private void DrawVerticalGridLines(Graphics gr, int y)
185191
if (c.IsVisible)
186192
{
187193
x += c.Width;
188-
gr.DrawLine(SystemPens.InactiveBorder, x - 1, y, x - 1, gr.ClipBounds.Bottom);
194+
gr.DrawLine(_line2Pen, x - 1, y, x - 1, gr.ClipBounds.Bottom);
189195
}
190196
}
191197
}
192198

193-
private void DrawColumnHeaders(Graphics gr)
199+
private void DrawColumnHeaders(Graphics gr, Color back, Color fore, Color text)
194200
{
195201
PerformanceAnalyzer.Start("DrawColumnHeaders");
196202
ReorderColumnState reorder = Input as ReorderColumnState;
197203
int x = 0;
198-
TreeColumn.DrawBackground(gr, new Rectangle(0, 0, ClientRectangle.Width + 2, ActualColumnHeaderHeight - 1), false, false);
199-
gr.TranslateTransform(-OffsetX, 0);
204+
205+
if (this.CustomDrawHeaders) TreeColumn.DrawCustomBackground(gr, back, fore, new Rectangle(0, 0, ClientRectangle.Width + 2, ActualColumnHeaderHeight - 1), false, false);
206+
else TreeColumn.DrawBackground(gr, new Rectangle(0, 0, ClientRectangle.Width + 2, ActualColumnHeaderHeight - 1), false, false);
207+
208+
gr.TranslateTransform(-OffsetX, 0);
200209
foreach (TreeColumn c in Columns)
201210
{
202211
if (c.IsVisible)
@@ -206,7 +215,12 @@ private void DrawColumnHeaders(Graphics gr)
206215
Rectangle rect = new Rectangle(x, 0, c.Width, ActualColumnHeaderHeight - 1);
207216
gr.SetClip(rect);
208217
bool pressed = ((Input is ClickColumnState || reorder != null) && ((Input as ColumnState).Column == c));
209-
c.Draw(gr, rect, Font, pressed, _hotColumn == c);
218+
219+
if (this.CustomDrawHeaders) TreeColumn.DrawCustomBackground(gr, back, fore, rect, pressed, _hotColumn == c);
220+
else TreeColumn.DrawBackground(gr, rect, pressed, _hotColumn == c);
221+
222+
c.Draw(gr, rect, Font, pressed, _hotColumn == c, text);
223+
210224
gr.ResetClip();
211225

212226
if (reorder != null && reorder.DropColumn == c)

‎External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeViewAdv.Properties.cs

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ namespace Aga.Controls.Tree
1313
public partial class TreeViewAdv
1414
{
1515
private Cursor _innerCursor = null;
16+
public bool CustomDrawHeaders = false;
1617

17-
public override Cursor Cursor
18+
public override Cursor Cursor
1819
{
1920
get
2021
{
@@ -657,7 +658,43 @@ public int Indent
657658
}
658659
}
659660

660-
private Color _lineColor = SystemColors.ControlDark;
661+
private Color _columnTextColor = SystemColors.ControlText;
662+
[Category("Behavior")]
663+
public Color ColumnHeaderTextColor
664+
{
665+
get { return _columnTextColor; }
666+
set
667+
{
668+
_columnTextColor = value;
669+
UpdateView();
670+
}
671+
}
672+
673+
private Color _columnBackColor = SystemColors.Control;
674+
[Category("Behavior")]
675+
public Color ColumnHeaderBackColor
676+
{
677+
get { return _columnBackColor; }
678+
set
679+
{
680+
_columnBackColor = value;
681+
UpdateView();
682+
}
683+
}
684+
685+
private Color _columnBorderColor = SystemColors.ActiveBorder;
686+
[Category("Behavior")]
687+
public Color ColumnHeaderBorderColor
688+
{
689+
get { return _columnBorderColor; }
690+
set
691+
{
692+
_columnBorderColor = value;
693+
UpdateView();
694+
}
695+
}
696+
697+
private Color _lineColor = SystemColors.ControlDark;
661698
[Category("Behavior")]
662699
public Color LineColor
663700
{
@@ -670,7 +707,20 @@ public Color LineColor
670707
}
671708
}
672709

673-
private Color _dragDropMarkColor = Color.Black;
710+
private Color _lineColor2 = SystemColors.ControlDark;
711+
[Category("Behavior")]
712+
public Color LineColor2
713+
{
714+
get { return _lineColor2; }
715+
set
716+
{
717+
_lineColor2 = value;
718+
CreateLine2Pen();
719+
UpdateView();
720+
}
721+
}
722+
723+
private Color _dragDropMarkColor = Color.Black;
674724
[Category("Behavior")]
675725
public Color DragDropMarkColor
676726
{

‎External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeViewAdv.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public partial class TreeViewAdv : Control
2929
private const int DividerCorrectionGap = -2;
3030

3131
private Pen _linePen;
32-
private Pen _markPen;
32+
private Pen _line2Pen;
33+
private Pen _markPen;
3334
private bool _suspendUpdate;
3435
private bool _needFullUpdate;
3536
private bool _fireSelectionEvent;
@@ -491,7 +492,8 @@ protected override void Dispose(bool disposing)
491492
if (_dragBitmap != null) _dragBitmap.Dispose();
492493
if (_dragTimer != null) _dragTimer.Dispose();
493494
if (_linePen != null) _linePen.Dispose();
494-
if (_markPen != null) _markPen.Dispose();
495+
if (_line2Pen != null) _linePen.Dispose();
496+
if (_markPen != null) _markPen.Dispose();
495497
}
496498
base.Dispose(disposing);
497499
}

‎External/Plugins/FlashDebugger/Controls/DataTreeControl.cs

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public DataTreeControl(bool watchMode)
5353
{
5454
this.watchMode = true;
5555
NameNodeTextBox.EditEnabled = true;
56-
NameNodeTextBox.DrawText += NameNodeTextBox_DrawText;
5756
NameNodeTextBox.EditorShowing += NameNodeTextBox_EditorShowing;
5857
NameNodeTextBox.EditorHided += NameNodeTextBox_EditorHided;
5958
NameNodeTextBox.IsEditEnabledValueNeeded += NameNodeTextBox_IsEditEnabledValueNeeded;
@@ -69,6 +68,17 @@ public DataTreeControl(bool watchMode)
6968
_tree.NodeMouseDoubleClick += Tree_NodeMouseDoubleClick;
7069
_tree.LoadOnDemand = true;
7170
_tree.AutoRowHeight = true;
71+
_tree.HideSelection = true;
72+
73+
_tree.CustomDrawHeaders = PluginBase.MainForm.GetThemeColor("ColumnHeader.BorderColor") != Color.Empty;
74+
_tree.ColumnHeaderBackColor = PluginBase.MainForm.GetThemeColor("ColumnHeader.BackColor", SystemColors.Control);
75+
_tree.ColumnHeaderTextColor = PluginBase.MainForm.GetThemeColor("ColumnHeader.TextColor", SystemColors.ControlText);
76+
_tree.ColumnHeaderBorderColor = PluginBase.MainForm.GetThemeColor("ColumnHeader.BorderColor", SystemColors.ActiveBorder);
77+
_tree.LineColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.LineColor", SystemColors.WindowText);
78+
_tree.LineColor2 = PluginBase.MainForm.GetThemeColor("DataTreeControl.LineColor", SystemColors.WindowText);
79+
_tree.DragDropMarkColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.ForeColor", SystemColors.WindowText);
80+
81+
NameNodeTextBox.DrawText += NameNodeTextBox_DrawText;
7282
ValueNodeTextBox.DrawText += ValueNodeTextBox_DrawText;
7383
ValueNodeTextBox.IsEditEnabledValueNeeded += ValueNodeTextBox_IsEditEnabledValueNeeded;
7484
ValueNodeTextBox.EditorShowing += ValueNodeTextBox_EditorShowing;
@@ -154,10 +164,14 @@ void DataTreeDisplayChanged(object sender, EventArgs e)
154164

155165
void NameNodeTextBox_DrawText(object sender, DrawEventArgs e)
156166
{
167+
Color grayText = PluginBase.MainForm.GetThemeColor("DataTreeControl.GrayText", SystemColors.GrayText);
168+
Color hiliteText = PluginBase.MainForm.GetThemeColor("DataTreeControl.HighlightText", SystemColors.HighlightText);
169+
e.TextColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.ForeColor", SystemColors.WindowText);
170+
if (e.Node.IsSelected) e.TextColor = hiliteText;
157171
try
158172
{
159173
if (e.Node.NextNode == null && e.Node.Level == 1 && !addingNewExpression) e.Font = new Font(e.Font, FontStyle.Italic);
160-
else if (e.Node.Tag is ErrorNode) e.TextColor = e.Node.IsSelected ? Color.White : Color.Gray;
174+
else if (e.Node.Tag is ErrorNode) e.TextColor = e.Node.IsSelected ? hiliteText : grayText;
161175

162176
}
163177
catch (Exception) { }
@@ -286,6 +300,11 @@ void ValueNodeTextBox_IsEditEnabledValueNeeded(object sender, NodeControlValueEv
286300

287301
void ValueNodeTextBox_DrawText(object sender, DrawEventArgs e)
288302
{
303+
Color grayText = PluginBase.MainForm.GetThemeColor("DataTreeControl.GrayText", SystemColors.GrayText);
304+
Color errorText = PluginBase.MainForm.GetThemeColor("DataTreeControl.ErrorText", Color.Red);
305+
Color hiliteText = PluginBase.MainForm.GetThemeColor("DataTreeControl.HighlightText", SystemColors.HighlightText);
306+
e.TextColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.ForeColor", SystemColors.WindowText);
307+
if (e.Node.IsSelected) e.TextColor = hiliteText;
289308
try
290309
{
291310
VariableNode variableNode = e.Node.Tag as VariableNode;
@@ -294,12 +313,12 @@ void ValueNodeTextBox_DrawText(object sender, DrawEventArgs e)
294313
FlashInterface flashInterface = PluginMain.debugManager.FlashInterface;
295314
if (variableNode.Variable != null && variableNode.Variable.hasValueChanged(flashInterface.Session))
296315
{
297-
e.TextColor = Color.Red;
316+
e.TextColor = errorText;
298317
}
299318
}
300319
else if (e.Node.Tag is ErrorNode)
301320
{
302-
e.TextColor = e.Node.IsSelected ? Color.White : Color.Gray;
321+
e.TextColor = e.Node.IsSelected ? hiliteText : grayText;
303322
}
304323
}
305324
catch (NullReferenceException) {}

‎External/Plugins/FlashDebugger/Controls/StackframeUI.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public void ClearItem()
200200
{
201201
wholeFrameStack.Clear();
202202
lv.Items.Clear();
203-
toolStripTextBoxFilter.Enabled = lv.Enabled = false;
203+
toolStripTextBoxFilter.Enabled = false;
204204
}
205205

206206
public void ActiveItem()
@@ -286,12 +286,12 @@ public void AddFrames(Frame[] frames)
286286
wholeFrameStack.Add(listItem);
287287
}
288288
FilterResults();
289-
toolStripTextBoxFilter.Enabled = lv.Enabled = true;
289+
toolStripTextBoxFilter.Enabled = true;
290290
}
291291
else
292292
{
293293
lv.Items.Clear();
294-
toolStripTextBoxFilter.Enabled = lv.Enabled = false;
294+
toolStripTextBoxFilter.Enabled = false;
295295
}
296296
}
297297

‎External/Plugins/FlashLogViewer/PluginUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ private void UpdateMainRegexes()
564564
}
565565
catch
566566
{
567-
this.Settings.RegexError = "Error #";
567+
this.Settings.RegexError = "Error: ";
568568
this.reError = new Regex(this.Settings.RegexError, RegexOptions.IgnoreCase);
569569
}
570570
try

‎External/Plugins/ProjectManager/Controls/TreeView/DirectoryNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public override void Refresh(bool recursive)
9292
SelectedImageIndex = ImageIndex;
9393

9494
Color textColor = PluginBase.MainForm.GetThemeColor(colorId);
95-
if (colorId != "ProjectTreeView.ForeColor" && textColor == Color.Empty) textColor = Color.Blue;
95+
if (colorId != "ProjectTreeView.ForeColor" && textColor == Color.Empty) textColor = SystemColors.Highlight;
9696
if (textColor != Color.Empty) ForeColorRequest = textColor;
9797
else ForeColorRequest = SystemColors.ControlText;
9898

‎External/Plugins/ProjectManager/Controls/TreeView/FileNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public override void Refresh(bool recursive)
9191
}
9292

9393
Color textColor = PluginBase.MainForm.GetThemeColor(colorId);
94-
if (colorId != "ProjectTreeView.ForeColor" && textColor == Color.Empty) textColor = Color.Blue;
94+
if (colorId != "ProjectTreeView.ForeColor" && textColor == Color.Empty) textColor = SystemColors.Highlight;
9595

9696
if (textColor != Color.Empty) ForeColorRequest = textColor;
9797
else ForeColorRequest = SystemColors.ControlText;

0 commit comments

Comments
 (0)