From 753a880c0d5eb6fa6f466ef5e36713203409e13f Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Wed, 27 Sep 2017 20:34:58 -0500 Subject: Revert "Added a buggy dynamically changing infobox (this will most likely not work)" This reverts commit 23791cf63b61a2a922e80e5077ec5a3ad0ce7c53. --- .vs/ShiftOS/v15/sqlite3/storage.ide | Bin 3678208 -> 3678208 bytes .../WindowManager/InfoboxTemplate.Designer.cs | 2 +- ShiftOS.Engine/WindowManager/InfoboxTemplate.cs | 20 ++------------------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide index daba2e0..a031093 100644 Binary files a/.vs/ShiftOS/v15/sqlite3/storage.ide and b/.vs/ShiftOS/v15/sqlite3/storage.ide differ diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs index 29d9299..a076c2a 100644 --- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs +++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs @@ -70,7 +70,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.Location = new System.Drawing.Point(0, 34); + this.pictureBox1.Location = new System.Drawing.Point(3, 35); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(80, 70); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs index d8ad071..a5be129 100644 --- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs +++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs @@ -11,12 +11,6 @@ namespace ShiftOS.Engine.WindowManager Stream _str; private int _buttonChoice; private int _buttonSelected; - private int _leftDistance; - private int _rightDistance; - private int _textWidth; - private int _textHeight; - private int _topDistance; - private int _bottomDistance; public InfoboxTemplate(ButtonType type) { InitializeComponent(); @@ -90,18 +84,8 @@ namespace ShiftOS.Engine.WindowManager private void changeSize_Tick(object sender, EventArgs e) { - ChangeSize(); - } - private void ChangeSize() - { - _textHeight = label1.Height; - _textWidth = label1.Width; - _topDistance = 55; - _bottomDistance = 121; - _rightDistance = 101; - _leftDistance = 55; - this.Height = _textHeight + _topDistance + _bottomDistance; - this.Width = _textWidth + _leftDistance + _rightDistance; + this.Height += label1.Height; + this.Width += label1.Width; } } } -- cgit v1.2.3