aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Engine/WindowManager
diff options
context:
space:
mode:
authorFloppyDiskDrive <[email protected]>2017-10-01 09:52:26 -0500
committerFloppyDiskDrive <[email protected]>2017-10-01 09:52:26 -0500
commitaa44f27eab230f464e9778a4256c330a056a7b3c (patch)
treee6fbc5ac67890b11293f682c279ff7670ecef8cf /ShiftOS.Engine/WindowManager
parentc23e42cc396d4fc55799d659bae2149cc183dbf6 (diff)
downloadshiftos-rewind-aa44f27eab230f464e9778a4256c330a056a7b3c.tar.gz
shiftos-rewind-aa44f27eab230f464e9778a4256c330a056a7b3c.tar.bz2
shiftos-rewind-aa44f27eab230f464e9778a4256c330a056a7b3c.zip
Revert "Added a fuckton of changes"
This reverts commit c23e42cc396d4fc55799d659bae2149cc183dbf6.
Diffstat (limited to 'ShiftOS.Engine/WindowManager')
-rw-r--r--ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs3
-rw-r--r--ShiftOS.Engine/WindowManager/InfoboxTemplate.cs29
2 files changed, 6 insertions, 26 deletions
diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs
index 2675935..a076c2a 100644
--- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs
+++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs
@@ -69,7 +69,7 @@
//
this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
- this.pictureBox1.Image = global::ShiftOS.Engine.Properties.Resources.symbolInfo;
+ this.pictureBox1.Image = global::ShiftOS.Engine.Properties.Resources.Symbolinfo;
this.pictureBox1.Location = new System.Drawing.Point(3, 35);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(80, 70);
@@ -80,6 +80,7 @@
// changeSize
//
this.changeSize.Interval = 1;
+ this.changeSize.Tick += new System.EventHandler(this.changeSize_Tick);
//
// label1
//
diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
index c5e49de..a5be129 100644
--- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
+++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
@@ -11,7 +11,7 @@ namespace ShiftOS.Engine.WindowManager
Stream _str;
private int _buttonChoice;
private int _buttonSelected;
- public InfoboxTemplate(ButtonType type, ErrorIcon icon)
+ public InfoboxTemplate(ButtonType type)
{
InitializeComponent();
@@ -34,21 +34,6 @@ namespace ShiftOS.Engine.WindowManager
_buttonChoice = 3;
break;
}
- switch (icon)
- {
- case ErrorIcon.Critical:
- SetImage(Properties.Resources.symbolError);
- break;
- case ErrorIcon.Error:
- SetImage(Properties.Resources.symbolWarning);
- break;
- case ErrorIcon.Info:
- SetImage(Properties.Resources.symbolInfo);
- break;
- case ErrorIcon.Question:
- SetImage(Properties.Resources.symbolQuestion);
- break;
- }
}
public enum ButtonType
@@ -58,13 +43,6 @@ namespace ShiftOS.Engine.WindowManager
Ok
}
- public enum ErrorIcon
- {
- Info,
- Critical,
- Error,
- Question
- }
private void btnOpt1_Click(object sender, EventArgs e)
{
switch (btnOpt1.Text)
@@ -104,9 +82,10 @@ namespace ShiftOS.Engine.WindowManager
private void InfoboxTemplate_Load(object sender, EventArgs e)
=> Play();
- private void SetImage(Image imageType)
+ private void changeSize_Tick(object sender, EventArgs e)
{
- pictureBox1.Image = imageType;
+ this.Height += label1.Height;
+ this.Width += label1.Width;
}
}
}