Skip to content

Commit ecc2bdd

Browse files
authored
Merge pull request #101 from Stefan6440/develop
materiallistview-textalign-columns
2 parents 4affa6d + 0a34844 commit ecc2bdd

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/ReaLTaiizor/Controls/ListView/MaterialListView.cs

+8-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ protected override void OnDrawColumnHeader(DrawListViewColumnHeaderEventArgs e)
110110
Enabled ? SkinManager.TextHighEmphasisNoAlphaColor : SkinManager.TextDisabledOrHintColor,
111111
new Point(e.Bounds.Location.X + PAD, e.Bounds.Location.Y),
112112
new Size(e.Bounds.Size.Width - (PAD * 2), e.Bounds.Size.Height),
113-
MaterialNativeTextRenderer.TextAlignFlags.Left | MaterialNativeTextRenderer.TextAlignFlags.Middle);
113+
e.Header.TextAlign == HorizontalAlignment.Left ? MaterialNativeTextRenderer.TextAlignFlags.Left | MaterialNativeTextRenderer.TextAlignFlags.Middle
114+
: MaterialNativeTextRenderer.TextAlignFlags.Right | MaterialNativeTextRenderer.TextAlignFlags.Middle);
114115
}
115116

116117
protected override void OnDrawItem(DrawListViewItemEventArgs e)
@@ -136,6 +137,7 @@ protected override void OnDrawItem(DrawListViewItemEventArgs e)
136137
// Draw separator line
137138
g.DrawLine(new Pen(SkinManager.DividersColor), e.Bounds.Left, e.Bounds.Y, e.Bounds.Right, e.Bounds.Y);
138139

140+
var idx = 0;
139141
foreach (ListViewItem.ListViewSubItem subItem in e.Item.SubItems)
140142
{
141143
// Draw Text
@@ -146,7 +148,10 @@ protected override void OnDrawItem(DrawListViewItemEventArgs e)
146148
Enabled ? SkinManager.TextHighEmphasisNoAlphaColor : SkinManager.TextDisabledOrHintColor,
147149
new Point(subItem.Bounds.X + PAD, subItem.Bounds.Y),
148150
new Size(subItem.Bounds.Width - (PAD * 2), subItem.Bounds.Height),
149-
MaterialNativeTextRenderer.TextAlignFlags.Left | MaterialNativeTextRenderer.TextAlignFlags.Middle);
151+
Columns[idx].TextAlign == HorizontalAlignment.Left
152+
? MaterialNativeTextRenderer.TextAlignFlags.Left | MaterialNativeTextRenderer.TextAlignFlags.Middle
153+
: MaterialNativeTextRenderer.TextAlignFlags.Right | MaterialNativeTextRenderer.TextAlignFlags.Middle);
154+
++idx;
150155
}
151156
}
152157

@@ -224,4 +229,4 @@ protected override void OnBackColorChanged(EventArgs e)
224229
}
225230

226231
#endregion
227-
}
232+
}

0 commit comments

Comments
 (0)