diff options
| author | AShifter <[email protected]> | 2017-10-01 10:00:41 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-01 10:00:41 -0600 |
| commit | 5077745a2c10c993c22e00d1ce33b733563e2ac7 (patch) | |
| tree | 549a42753780224086e57d52d6d2a7a458c7a02d | |
| parent | fa6be3015633dbcf4250c3fe213d284d067016bd (diff) | |
| parent | b52e50320961ae5997b6b6de2f83cb15b21ba73d (diff) | |
| download | shiftos-rewind-5077745a2c10c993c22e00d1ce33b733563e2ac7.tar.gz shiftos-rewind-5077745a2c10c993c22e00d1ce33b733563e2ac7.tar.bz2 shiftos-rewind-5077745a2c10c993c22e00d1ce33b733563e2ac7.zip | |
Merge pull request #7 from AShifter/master
Master
| -rw-r--r-- | .vs/ShiftOS/v15/sqlite3/storage.ide | bin | 835584 -> 835584 bytes | |||
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide Binary files differindex 8466a5c..610893e 100644 --- a/.vs/ShiftOS/v15/sqlite3/storage.ide +++ b/.vs/ShiftOS/v15/sqlite3/storage.ide diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs index f9f8f72..1534f36 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs @@ -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()); _colorType2 = Int32.Parse(greenUpDown.Value.ToString()); @@ -25,12 +25,13 @@ namespace ShiftOS.Main.ShiftOS.Apps try { _finalColor = Color.FromArgb(_colorType1, _colorType2, _colorType3); - //BackColor = _finalColor; + /* foreach (var window in ShiftWM.Windows) { window.Invoke(new Action(() => window.top.BackColor = _finalColor)); } + */ 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); } - //return _finalColor; + return _finalColor; } } } |