diff options
Diffstat (limited to 'ShiftOS-TheRevival/MainForms/DesktopEnvironment')
3 files changed, 16 insertions, 8 deletions
diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb index 54f7a80..e44cce2 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb @@ -42,8 +42,7 @@ Partial Class Desktop ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.Red - Me.BackgroundImage = Global.ShiftOS_TheRevival.My.Resources.Resources.MenuBanner1 + Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer)) Me.ClientSize = New System.Drawing.Size(800, 450) Me.Controls.Add(Me.Button1) Me.ForeColor = System.Drawing.Color.White diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb index 853bb8a..dcfcf33 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb @@ -12,6 +12,5 @@ Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click 'DuWM_FirstWindowSet(Console) - DuWM_SingleWindowSet(Console) End Sub End Class
\ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb index dd3ff8d..89d8b65 100644 --- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb +++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb @@ -1,19 +1,29 @@ Module DesktopManager - Public Sub StartX() + Public Sub StartG() Desktop.Show() Desktop.FormBorderStyle = FormBorderStyle.None Desktop.WindowState = FormWindowState.Maximized Desktop.TopMost = False IsConsoleParent = False - OnlyOne = True Console.Close() + WindowManagerChoose() Cursor.Show() End Sub - Public Sub StopX() - Desktop.Close() + Public Sub StopG() + DuWM_CurrentProcess = 0 + Strings.ProcessID(0) = 0 + Strings.ProcessID(1) = 0 Cursor.Hide() - Console_Full() IsConsoleParent = True + Console.Show() + Desktop.Close() + End Sub + + Public Sub WindowManagerChoose() + Select Case Strings.ComputerInfo(7) + Case 1 + DuWM_Initiate() + End Select End Sub End Module |