shiftos-archive/ShiftOS-C-
1
0
Fork 0
mirror of https://github.com/seriocomedy/ShiftOS-C-.git synced 2025-01-22 18:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix appveyor builds (hopefully)

Browse source
This commit is contained in:
MichaelTheShifter 2016-07-20 10:36:27 -04:00
parent 995b1404e0
commit c5576314e2
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/ShiftUI/Theming/ShiftOS.cs
View file

@ -17,6 +17,7 @@ public abstract class Skin
#endregion #endregion
#region Global #region Global
public Color SelectionHighlight = Color.Black;
public string DefaultFont = "Microsoft Sans Serif"; public string DefaultFont = "Microsoft Sans Serif";
public Color VisualStyleBorderColor = Color.Black; public Color VisualStyleBorderColor = Color.Black;
public int VisualStyleBorderWidth = 2; public int VisualStyleBorderWidth = 2;
@ -36,6 +37,13 @@ public abstract class Skin
public Color Border3DBottomRightInner = Color.Gray; public Color Border3DBottomRightInner = Color.Gray;
#endregion #endregion
#region CheckBox
public Color CheckBoxCheckColor = Color.Black;
public Color CheckBoxBorderColor = Color.Black;
public Color CheckBoxBackgroundColor = Color.White;
public int CheckBoxBorderWidth = 2;
#endregion
#region MessageBox #region MessageBox
public Color MessageBox_BottomPanel = Color.Gray; public Color MessageBox_BottomPanel = Color.Gray;
#endregion #endregion

8
source/ShiftUI/Theming/ThemeSkinnable.cs
View file

@ -3141,20 +3141,20 @@ protected virtual void DrawListViewItem(Graphics dc, ListView control, ListViewI
int scale = Math.Max(1, rect_checkrect.Width / 12); int scale = Math.Max(1, rect_checkrect.Width / 12);
// set the checkbox background // set the checkbox background
dc.FillRectangle(SystemBrushes.Window, dc.FillRectangle(new SolidBrush(Application.CurrentSkin.CheckBoxBackgroundColor),
rect_checkrect); rect_checkrect);
// define a rectangle inside the border area // define a rectangle inside the border area
Rectangle rect = new Rectangle(rect_checkrect.X + 2, Rectangle rect = new Rectangle(rect_checkrect.X + 2,
rect_checkrect.Y + 2, rect_checkrect.Y + 2,
rect_checkrect.Width - 4, rect_checkrect.Width - 4,
rect_checkrect.Height - 4); rect_checkrect.Height - 4);
Pen pen = ResPool.GetSizedPen(this.ColorWindowText, 2); Pen pen = new Pen(new SolidBrush(Application.CurrentSkin.CheckBoxBorderColor), Application.CurrentSkin.CheckBoxBorderWidth);
dc.DrawRectangle(pen, rect); dc.DrawRectangle(pen, rect);
// Need to draw a check-mark // Need to draw a check-mark
if (item.Checked) if (item.Checked)
{ {
Pen check_pen = ResPool.GetSizedPen(this.ColorWindowText, 1); Pen check_pen = new Pen(new SolidBrush(Application.CurrentSkin.CheckBoxCheckColor), 1);
// adjustments to get the check-mark at the right place // adjustments to get the check-mark at the right place
rect.X++; rect.Y++; rect.X++; rect.Y++;
// following logic is taken from DrawFrameControl method // following logic is taken from DrawFrameControl method
@ -3235,7 +3235,7 @@ protected virtual void DrawListViewItem(Graphics dc, ListView control, ListViewI
} }
if (item.Selected && control.Focused) if (item.Selected && control.Focused)
dc.FillRectangle(SystemBrushes.Highlight, highlight_rect); dc.FillRectangle(new SolidBrush(Application.CurrentSkin.SelectionHighlight), highlight_rect);
else if (item.Selected && !control.HideSelection) else if (item.Selected && !control.HideSelection)
dc.FillRectangle(SystemBrushes.Control, highlight_rect); dc.FillRectangle(SystemBrushes.Control, highlight_rect);
else else

2
source/WindowsFormsApplication1/ShiftOS.csproj
View file

@ -63,7 +63,7 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="ShiftUI"> <Reference Include="ShiftUI">
<HintPath>..\..\..\Project-Circle\ShiftUI\bin\Debug\ShiftUI.dll</HintPath> <HintPath>..\ShiftUI\bin\Debug\ShiftUI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Svg, Version=2.1.0.28187, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL"> <Reference Include="Svg, Version=2.1.0.28187, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
<HintPath>..\packages\Svg.2.1.0\lib\Svg.dll</HintPath> <HintPath>..\packages\Svg.2.1.0\lib\Svg.dll</HintPath>