Skip to content

Commit d0e6334

Browse files
jpobstjpobst
committed
Finish up XML documentation.
1 parent 809b60c commit d0e6334

35 files changed

Lines changed: 510 additions & 325 deletions

‎samples/ControlGallery/Panels/ButtonPanel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ButtonPanel ()
2828
};
2929

3030
b2.Style.BackgroundColor = SKColors.White;
31-
b2.Style.ForegroundColor = Theme.RibbonColor;
31+
b2.Style.ForegroundColor = Theme.PrimaryColor;
3232
b2.Style.Border.Width = 3;
3333
b2.Style.Border.Color = SKColors.Red;
3434

‎samples/Explorer/MainForm.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,41 +81,41 @@ private void ThemeButton_Clicked (object sender, EventArgs args)
8181
Theme.FormBackgroundColor = SKColors.White;
8282
Theme.NeutralGray = new SKColor (240, 240, 240);
8383
Theme.LightNeutralGray = new SKColor (251, 251, 251);
84-
Theme.RibbonItemHighlightColor = new SKColor (198, 198, 198);
84+
Theme.ItemHighlightColor = new SKColor (198, 198, 198);
8585

8686
switch (item.Text) {
8787
case "Default":
8888
Theme.BeginUpdate ();
89-
Theme.RibbonTabHighlightColor = new SKColor (42, 138, 208);
90-
Theme.RibbonColor = new SKColor (16, 110, 190);
89+
Theme.HighlightColor = new SKColor (42, 138, 208);
90+
Theme.PrimaryColor = new SKColor (16, 110, 190);
9191
Theme.EndUpdate ();
9292
break;
9393
case "Green":
9494
Theme.BeginUpdate ();
95-
Theme.RibbonTabHighlightColor = new SKColor (67, 148, 103);
96-
Theme.RibbonColor = new SKColor (33, 115, 70);
95+
Theme.HighlightColor = new SKColor (67, 148, 103);
96+
Theme.PrimaryColor = new SKColor (33, 115, 70);
9797
Theme.EndUpdate ();
9898
break;
9999
case "Orange":
100100
Theme.BeginUpdate ();
101-
Theme.RibbonTabHighlightColor = new SKColor (220, 89, 57);
102-
Theme.RibbonColor = new SKColor (183, 71, 42);
101+
Theme.HighlightColor = new SKColor (220, 89, 57);
102+
Theme.PrimaryColor = new SKColor (183, 71, 42);
103103
Theme.EndUpdate ();
104104
break;
105105
case "Purple":
106106
Theme.BeginUpdate ();
107-
Theme.RibbonTabHighlightColor = new SKColor (163, 86, 158);
108-
Theme.RibbonColor = new SKColor (128, 57, 123);
107+
Theme.HighlightColor = new SKColor (163, 86, 158);
108+
Theme.PrimaryColor = new SKColor (128, 57, 123);
109109
Theme.EndUpdate ();
110110
break;
111111
case "Hotdog Stand":
112112
Theme.BeginUpdate ();
113-
Theme.RibbonTabHighlightColor = new SKColor (255, 128, 128);
113+
Theme.HighlightColor = new SKColor (255, 128, 128);
114114
Theme.FormBackgroundColor = SKColors.Yellow;
115115
Theme.NeutralGray = SKColors.White;
116116
Theme.LightNeutralGray = new SKColor (255, 0, 0);
117-
Theme.RibbonItemHighlightColor = new SKColor (255, 255, 255);
118-
Theme.RibbonColor = new SKColor (255, 0, 0);
117+
Theme.ItemHighlightColor = new SKColor (255, 255, 255);
118+
Theme.PrimaryColor = new SKColor (255, 0, 0);
119119
Theme.EndUpdate ();
120120
break;
121121
}

‎src/Modern.Forms/Button.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public Button ()
3737
/// </summary>
3838
public new static ControlStyle DefaultStyleHover = new ControlStyle (DefaultStyle,
3939
(style) => {
40-
style.BackgroundColor = Theme.RibbonTabHighlightColor;
41-
style.Border.Color = Theme.RibbonColor;
40+
style.BackgroundColor = Theme.HighlightColor;
41+
style.Border.Color = Theme.PrimaryColor;
4242
style.ForegroundColor = Theme.LightTextColor;
4343
});
4444

‎src/Modern.Forms/Control.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public Cursor Cursor {
228228
/// </summary>
229229
public static ControlStyle DefaultStyle = new ControlStyle (null,
230230
(style) => {
231-
style.ForegroundColor = Theme.DarkTextColor;
231+
style.ForegroundColor = Theme.PrimaryTextColor;
232232
style.BackgroundColor = Theme.NeutralGray;
233233
style.Font = Theme.UIFont;
234234
style.FontSize = Theme.FontSize;

‎src/Modern.Forms/ControlPaint.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static void DrawArrowGlyph (PaintEventArgs e, Rectangle rectangle, SKColo
6262
public static void DrawCheckBox (PaintEventArgs e, Rectangle rectangle, CheckState state, bool disabled = false)
6363
{
6464
var color = disabled ? Theme.DisabledTextColor
65-
: state == CheckState.Checked && !disabled ? Theme.RibbonColor
65+
: state == CheckState.Checked && !disabled ? Theme.PrimaryColor
6666
: Theme.BorderGray;
6767
var unit_1 = e.LogicalToDeviceUnits (1);
6868

@@ -124,13 +124,13 @@ public static void DrawRadioButton (PaintEventArgs e, Point origin, CheckState s
124124
var outer_radius = e.LogicalToDeviceUnits (8);
125125
var inner_radius = e.LogicalToDeviceUnits (5);
126126
var border_color = disabled ? Theme.DisabledTextColor :
127-
state == CheckState.Checked ? Theme.RibbonColor :
127+
state == CheckState.Checked ? Theme.PrimaryColor :
128128
Theme.BorderGray;
129129

130130
e.Canvas.DrawCircle (origin.X, origin.Y, outer_radius, border_color, e.LogicalToDeviceUnits (1));
131131

132132
if (state == CheckState.Checked)
133-
e.Canvas.FillCircle (origin.X, origin.Y, inner_radius, disabled ? Theme.DisabledTextColor : Theme.RibbonColor);
133+
e.Canvas.FillCircle (origin.X, origin.Y, inner_radius, disabled ? Theme.DisabledTextColor : Theme.PrimaryColor);
134134
}
135135
}
136136
}

‎src/Modern.Forms/ControlStyle.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ public ControlStyle (ControlStyle parent)
7979
/// <summary>
8080
/// Gets the computed foreground color.
8181
/// </summary>
82-
public SKColor GetForegroundColor () => ForegroundColor ?? _parent?.GetForegroundColor () ?? Theme.DarkTextColor;
82+
public SKColor GetForegroundColor () => ForegroundColor ?? _parent?.GetForegroundColor () ?? Theme.PrimaryTextColor;
8383
}
8484
}

‎src/Modern.Forms/DpiHelper.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ private static double LogicalToDeviceUnitsScalingFactor {
2525
/// Transforms a horizontal or vertical integer coordinate from logical to device units
2626
/// by scaling it up for current DPI and rounding to nearest integer value
2727
/// </summary>
28-
/// <param name="value">value in logical units</param>
29-
/// <returns>value in device units</returns>
3028
public static int LogicalToDeviceUnits (int value, int devicePixels)
3129
{
3230
if (devicePixels == 0)
@@ -40,8 +38,6 @@ public static int LogicalToDeviceUnits (int value, int devicePixels)
4038
/// Returns a new Size with the input's
4139
/// dimensions converted from logical units to device units.
4240
/// </summary>
43-
/// <param name="logicalSize">Size in logical units</param>
44-
/// <returns>Size in device units</returns>
4541
public static Size LogicalToDeviceUnits (Size logicalSize, int deviceDpi)
4642
{
4743
return new Size (LogicalToDeviceUnits (logicalSize.Width, deviceDpi),
@@ -52,8 +48,6 @@ public static Size LogicalToDeviceUnits (Size logicalSize, int deviceDpi)
5248
/// Returns a new Padding with the input's
5349
/// dimensions converted from logical units to device units.
5450
/// </summary>
55-
/// <param name="logicalPadding">Padding in logical units</param>
56-
/// <returns>Padding in device units</returns>
5751
public static Padding LogicalToDeviceUnits (Padding logicalPadding, int deviceDpi)
5852
{
5953
return new Padding (LogicalToDeviceUnits (logicalPadding.Left, deviceDpi),

‎src/Modern.Forms/Form.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public bool AllowMinimize {
5151
public new static ControlStyle DefaultStyle = new ControlStyle (Control.DefaultStyle,
5252
(style) => {
5353
style.BackgroundColor = Theme.FormBackgroundColor;
54-
style.Border.Color = Theme.RibbonColor;
54+
style.Border.Color = Theme.PrimaryColor;
5555
style.Border.Width = 1;
5656
});
5757

‎src/Modern.Forms/FormTitleBar.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public FormTitleBar ()
3737

3838
/// <inheritdoc/>
3939
public new static ControlStyle DefaultStyle = new ControlStyle (Control.DefaultStyle,
40-
(style) => style.BackgroundColor = Theme.RibbonColor);
40+
(style) => style.BackgroundColor = Theme.PrimaryColor);
4141

4242
/// <summary>
4343
/// Gets the element at the specified location.

‎src/Modern.Forms/MenuDropDown.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ internal override void Deactivate ()
4646
/// <inheritdoc/>
4747
public new static ControlStyle DefaultStyle = new ControlStyle (Control.DefaultStyle,
4848
(style) => {
49-
style.BackgroundColor = Theme.RibbonItemHighlightColor;
49+
style.BackgroundColor = Theme.ItemHighlightColor;
5050
style.Border.Width = 1;
5151
});
5252

0 commit comments

Comments
 (0)