shiftos-archive/ShiftOS-Rewind
1
0
Fork 0
mirror of https://github.com/ShiftOS-Rewind/ShiftOS.git synced 2025-01-22 11:21:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from AShifter/master

Browse source 
Master
This commit is contained in:
AShifter 2017-10-01 10:00:41 -06:00 committed by GitHub
commit 5077745a2c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/ShiftOS/v15/sqlite3/storage.ide
View file

Binary file not shown.

7
ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs
View file

@ -17,7 +17,7 @@ namespace ShiftOS.Main.ShiftOS.Apps
} }
private void btnSetColor_Click(object sender, EventArgs e) private Color btnSetColor_Click(object sender, EventArgs e)
{ {
_colorType1 = Int32.Parse(redUpDown.Value.ToString()); _colorType1 = Int32.Parse(redUpDown.Value.ToString());
_colorType2 = Int32.Parse(greenUpDown.Value.ToString()); _colorType2 = Int32.Parse(greenUpDown.Value.ToString());
@ -25,12 +25,13 @@ namespace ShiftOS.Main.ShiftOS.Apps
try try
{ {
_finalColor = Color.FromArgb(_colorType1, _colorType2, _colorType3); _finalColor = Color.FromArgb(_colorType1, _colorType2, _colorType3);
//BackColor = _finalColor;
/*
foreach (var window in ShiftWM.Windows) foreach (var window in ShiftWM.Windows)
{ {
window.Invoke(new Action(() => window.top.BackColor = _finalColor)); window.Invoke(new Action(() => window.top.BackColor = _finalColor));
} }
*/
ShiftWM.StartInfoboxSession("Success!", $"Changed color to:\r\n{_colorType1}, {_colorType2}, {_colorType3}.", InfoboxTemplate.ButtonType.Ok); ShiftWM.StartInfoboxSession("Success!", $"Changed color to:\r\n{_colorType1}, {_colorType2}, {_colorType3}.", InfoboxTemplate.ButtonType.Ok);
} }
@ -38,7 +39,7 @@ namespace ShiftOS.Main.ShiftOS.Apps
{ {
ShiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.ButtonType.Ok); ShiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.ButtonType.Ok);
} }
//return _finalColor; return _finalColor;
} }
} }
} }