Switched to new C# expresssion-style properties

This commit is contained in:
Anton Kasyanov
2017-05-28 23:00:01 +03:00
parent b4cf26635e
commit c6ae2bde9f
2 changed files with 28 additions and 112 deletions

View File

@@ -34,22 +34,13 @@ namespace EveOPreview.UI
public bool MinimizeToTray public bool MinimizeToTray
{ {
get get => this.MinimizeToTrayCheckBox.Checked;
{ set => this.MinimizeToTrayCheckBox.Checked = value;
return this.MinimizeToTrayCheckBox.Checked;
}
set
{
this.MinimizeToTrayCheckBox.Checked = value;
}
} }
public double ThumbnailOpacity public double ThumbnailOpacity
{ {
get get => Math.Min(this.ThumbnailOpacityTrackBar.Value / 100.00, 1.00);
{
return Math.Min(this.ThumbnailOpacityTrackBar.Value / 100.00, 1.00);
}
set set
{ {
int barValue = (int)(100.0 * value); int barValue = (int)(100.0 * value);
@@ -68,70 +59,37 @@ namespace EveOPreview.UI
public bool EnableClientLayoutTracking public bool EnableClientLayoutTracking
{ {
get get => this.EnableClientLayoutTrackingCheckBox.Checked;
{ set => this.EnableClientLayoutTrackingCheckBox.Checked = value;
return this.EnableClientLayoutTrackingCheckBox.Checked;
}
set
{
this.EnableClientLayoutTrackingCheckBox.Checked = value;
}
} }
public bool HideActiveClientThumbnail public bool HideActiveClientThumbnail
{ {
get get => this.HideActiveClientThumbnailCheckBox.Checked;
{ set => this.HideActiveClientThumbnailCheckBox.Checked = value;
return this.HideActiveClientThumbnailCheckBox.Checked;
}
set
{
this.HideActiveClientThumbnailCheckBox.Checked = value;
}
} }
public bool ShowThumbnailsAlwaysOnTop public bool ShowThumbnailsAlwaysOnTop
{ {
get get => this.ShowThumbnailsAlwaysOnTopCheckBox.Checked;
{ set => this.ShowThumbnailsAlwaysOnTopCheckBox.Checked = value;
return this.ShowThumbnailsAlwaysOnTopCheckBox.Checked;
}
set
{
this.ShowThumbnailsAlwaysOnTopCheckBox.Checked = value;
}
} }
public bool HideThumbnailsOnLostFocus public bool HideThumbnailsOnLostFocus
{ {
get get => this.HideThumbnailsOnLostFocusCheckBox.Checked;
{ set => this.HideThumbnailsOnLostFocusCheckBox.Checked = value;
return this.HideThumbnailsOnLostFocusCheckBox.Checked;
}
set
{
this.HideThumbnailsOnLostFocusCheckBox.Checked = value;
}
} }
public bool EnablePerClientThumbnailLayouts public bool EnablePerClientThumbnailLayouts
{ {
get get => this.EnablePerClientThumbnailsLayoutsCheckBox.Checked;
{ set => this.EnablePerClientThumbnailsLayoutsCheckBox.Checked = value;
return this.EnablePerClientThumbnailsLayoutsCheckBox.Checked;
}
set
{
this.EnablePerClientThumbnailsLayoutsCheckBox.Checked = value;
}
} }
public Size ThumbnailSize public Size ThumbnailSize
{ {
get get => new Size((int)this.ThumbnailsWidthNumericEdit.Value, (int)this.ThumbnailsHeightNumericEdit.Value);
{
return new Size((int)this.ThumbnailsWidthNumericEdit.Value, (int)this.ThumbnailsHeightNumericEdit.Value);
}
set set
{ {
this.ThumbnailsWidthNumericEdit.Value = value.Width; this.ThumbnailsWidthNumericEdit.Value = value.Width;
@@ -141,10 +99,7 @@ namespace EveOPreview.UI
public bool EnableThumbnailZoom public bool EnableThumbnailZoom
{ {
get get => this.EnableThumbnailZoomCheckBox.Checked;
{
return this.EnableThumbnailZoomCheckBox.Checked;
}
set set
{ {
this.EnableThumbnailZoomCheckBox.Checked = value; this.EnableThumbnailZoomCheckBox.Checked = value;
@@ -154,14 +109,8 @@ namespace EveOPreview.UI
public int ThumbnailZoomFactor public int ThumbnailZoomFactor
{ {
get get => (int)this.ThumbnailZoomFactorNumericEdit.Value;
{ set => this.ThumbnailZoomFactorNumericEdit.Value = value;
return (int)this.ThumbnailZoomFactorNumericEdit.Value;
}
set
{
this.ThumbnailZoomFactorNumericEdit.Value = value;
}
} }
public ViewZoomAnchor ThumbnailZoomAnchor public ViewZoomAnchor ThumbnailZoomAnchor
@@ -196,46 +145,25 @@ namespace EveOPreview.UI
public bool ShowThumbnailOverlays public bool ShowThumbnailOverlays
{ {
get get => this.ShowThumbnailOverlaysCheckBox.Checked;
{ set => this.ShowThumbnailOverlaysCheckBox.Checked = value;
return this.ShowThumbnailOverlaysCheckBox.Checked;
}
set
{
this.ShowThumbnailOverlaysCheckBox.Checked = value;
}
} }
public bool ShowThumbnailFrames public bool ShowThumbnailFrames
{ {
get get => this.ShowThumbnailFramesCheckBox.Checked;
{ set => this.ShowThumbnailFramesCheckBox.Checked = value;
return this.ShowThumbnailFramesCheckBox.Checked;
}
set
{
this.ShowThumbnailFramesCheckBox.Checked = value;
}
} }
public bool EnableActiveClientHighlight public bool EnableActiveClientHighlight
{ {
get get => this.EnableActiveClientHighlightCheckBox.Checked;
{ set => this.EnableActiveClientHighlightCheckBox.Checked = value;
return this.EnableActiveClientHighlightCheckBox.Checked;
}
set
{
this.EnableActiveClientHighlightCheckBox.Checked = value;
}
} }
public Color ActiveClientHighlightColor public Color ActiveClientHighlightColor
{ {
get get => this._activeClientHighlightColor;
{
return this._activeClientHighlightColor;
}
set set
{ {
this._activeClientHighlightColor = value; this._activeClientHighlightColor = value;

View File

@@ -58,10 +58,7 @@ namespace EveOPreview.UI
public string Title public string Title
{ {
get get => this.Text;
{
return this.Text;
}
set set
{ {
this.Text = value; this.Text = value;
@@ -77,10 +74,7 @@ namespace EveOPreview.UI
public Point ThumbnailLocation public Point ThumbnailLocation
{ {
get get => this.Location;
{
return this.Location;
}
set set
{ {
if ((value.X > 0) || (value.Y > 0)) if ((value.X > 0) || (value.Y > 0))
@@ -93,14 +87,8 @@ namespace EveOPreview.UI
public Size ThumbnailSize public Size ThumbnailSize
{ {
get get => this.ClientSize;
{ set => this.ClientSize = value;
return this.ClientSize;
}
set
{
this.ClientSize = value;
}
} }
public Action<IntPtr> ThumbnailResized { get; set; } public Action<IntPtr> ThumbnailResized { get; set; }