From 6c5f8c6381166edf0824aed78a1c3f05b0c562d1 Mon Sep 17 00:00:00 2001 From: TheUltimateHacker Date: Wed, 27 May 2015 20:39:48 -0400 Subject: Draggable Windows in the BWM We're one step closer to the full Basic Window Manager implementation. I've created a UserControl called "TitleBar" for the BWM. This UserControl contains the window handling code for draggable windows, as well as a design-time settable AppName property that allows you to change the application display name (what text is shown on the titlebar). Shiftorium upgrades to unlock Draggable Windows will be added soon, but I have to clean the beast. --- shiftos_next.v12.suo | Bin 33280 -> 49152 bytes .../BWM User Controls/Titlebar.Designer.vb | 66 ++++++++++++ shiftos_next/BWM User Controls/Titlebar.resx | 120 +++++++++++++++++++++ shiftos_next/BWM User Controls/Titlebar.vb | 44 ++++++++ shiftos_next/ColorPicker.Designer.vb | 41 +++---- shiftos_next/Terminal.Designer.vb | 27 ++--- shiftos_next/Terminal.vb | 10 +- shiftos_next/TextPad.Designer.vb | 31 ++---- shiftos_next/TextPad.vb | 13 +-- shiftos_next/bin/Debug/shiftos_next.exe | Bin 2279424 -> 2280448 bytes shiftos_next/bin/Debug/shiftos_next.pdb | Bin 187904 -> 194048 bytes shiftos_next/file skimmer.Designer.vb | 33 ++---- shiftos_next/file skimmer.vb | 12 +-- .../DesignTimeResolveAssemblyReferences.cache | Bin 1008 -> 9167 bytes .../obj/Debug/shiftos_next.Titlebar.resources | Bin 0 -> 180 bytes shiftos_next/obj/Debug/shiftos_next.exe | Bin 2279424 -> 2280448 bytes shiftos_next/obj/Debug/shiftos_next.pdb | Bin 187904 -> 194048 bytes .../Debug/shiftos_next.vbproj.FileListAbsolute.txt | 1 + .../shiftos_next.vbproj.GenerateResource.Cache | Bin 1772 -> 1851 bytes shiftos_next/shiftos_next.vbproj | 9 ++ 20 files changed, 282 insertions(+), 125 deletions(-) create mode 100644 shiftos_next/BWM User Controls/Titlebar.Designer.vb create mode 100644 shiftos_next/BWM User Controls/Titlebar.resx create mode 100644 shiftos_next/BWM User Controls/Titlebar.vb create mode 100644 shiftos_next/obj/Debug/shiftos_next.Titlebar.resources diff --git a/shiftos_next.v12.suo b/shiftos_next.v12.suo index 02dcfeb..9b99923 100644 Binary files a/shiftos_next.v12.suo and b/shiftos_next.v12.suo differ diff --git a/shiftos_next/BWM User Controls/Titlebar.Designer.vb b/shiftos_next/BWM User Controls/Titlebar.Designer.vb new file mode 100644 index 0000000..980ad87 --- /dev/null +++ b/shiftos_next/BWM User Controls/Titlebar.Designer.vb @@ -0,0 +1,66 @@ + _ +Partial Class Titlebar + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.pnltop = New System.Windows.Forms.Panel() + Me.lbtitle = New System.Windows.Forms.Label() + Me.pnltop.SuspendLayout() + Me.SuspendLayout() + ' + 'pnltop + ' + Me.pnltop.BackColor = System.Drawing.Color.Gray + Me.pnltop.Controls.Add(Me.lbtitle) + Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top + Me.pnltop.Location = New System.Drawing.Point(0, 0) + Me.pnltop.Name = "pnltop" + Me.pnltop.Size = New System.Drawing.Size(678, 32) + Me.pnltop.TabIndex = 1 + ' + 'lbtitle + ' + Me.lbtitle.Dock = System.Windows.Forms.DockStyle.Fill + Me.lbtitle.Location = New System.Drawing.Point(0, 0) + Me.lbtitle.Name = "lbtitle" + Me.lbtitle.Size = New System.Drawing.Size(678, 32) + Me.lbtitle.TabIndex = 0 + Me.lbtitle.Text = "Color Picker" + Me.lbtitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Titlebar + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 14.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.pnltop) + Me.Font = New System.Drawing.Font("Courier New", 8.25!) + Me.ForeColor = System.Drawing.Color.White + Me.Name = "Titlebar" + Me.Size = New System.Drawing.Size(678, 32) + Me.pnltop.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + Friend WithEvents pnltop As System.Windows.Forms.Panel + Friend WithEvents lbtitle As System.Windows.Forms.Label + +End Class diff --git a/shiftos_next/BWM User Controls/Titlebar.resx b/shiftos_next/BWM User Controls/Titlebar.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/shiftos_next/BWM User Controls/Titlebar.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/shiftos_next/BWM User Controls/Titlebar.vb b/shiftos_next/BWM User Controls/Titlebar.vb new file mode 100644 index 0000000..7e380d5 --- /dev/null +++ b/shiftos_next/BWM User Controls/Titlebar.vb @@ -0,0 +1,44 @@ +Public Class Titlebar + + Public Property AppName As String + Set(value As String) + lbtitle.Text = value + End Set + Get + Return lbtitle.Text + End Get + End Property + + Friend WithEvents prnt As Form = ParentForm + + Private Sub titlebar_MouseDown(sender As Object, e As MouseEventArgs) Handles Me.MouseDown, lbtitle.MouseDown + ' Handle Draggable Windows + If boughtdraggablewindows = True Then + If e.Button = MouseButtons.Left Then + Me.Capture = False + lbtitle.Capture = False + Const WM_NCLBUTTONDOWN As Integer = &HA1S + Const HTCAPTION As Integer = 2 + Dim msg As Message = _ + Message.Create(ParentForm.Handle, WM_NCLBUTTONDOWN, _ + New IntPtr(HTCAPTION), IntPtr.Zero) + Me.DefWndProc(msg) + End If + End If + End Sub + + Public Sub DetermineMyVisibility() + If boughtbasicwm = True Then + Me.Show() + ParentForm.WindowState = FormWindowState.Normal + ParentForm.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2 + ParentForm.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2 + ParentForm.TopMost = True + Else + Me.Hide() + ParentForm.WindowState = FormWindowState.Maximized + ParentForm.TopMost = False + End If + End Sub + +End Class diff --git a/shiftos_next/ColorPicker.Designer.vb b/shiftos_next/ColorPicker.Designer.vb index 9aa95ad..46bdcd4 100644 --- a/shiftos_next/ColorPicker.Designer.vb +++ b/shiftos_next/ColorPicker.Designer.vb @@ -23,8 +23,6 @@ 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.pnltop = New System.Windows.Forms.Panel() - Me.lbtitle = New System.Windows.Forms.Label() Me.pnlcolors = New System.Windows.Forms.FlowLayoutPanel() Me.btnwhite = New System.Windows.Forms.Button() Me.btnblack = New System.Windows.Forms.Button() @@ -40,29 +38,10 @@ Me.btnok = New System.Windows.Forms.Button() Me.lbselectedcolor = New System.Windows.Forms.Label() Me.btncancel = New System.Windows.Forms.Button() - Me.pnltop.SuspendLayout() + Me.pnltop = New shiftos_next.Titlebar() Me.pnlcolors.SuspendLayout() Me.SuspendLayout() ' - 'pnltop - ' - Me.pnltop.BackColor = System.Drawing.Color.Gray - Me.pnltop.Controls.Add(Me.lbtitle) - Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top - Me.pnltop.Location = New System.Drawing.Point(0, 0) - Me.pnltop.Name = "pnltop" - Me.pnltop.Size = New System.Drawing.Size(362, 30) - Me.pnltop.TabIndex = 0 - ' - 'lbtitle - ' - Me.lbtitle.AutoSize = True - Me.lbtitle.Location = New System.Drawing.Point(12, 9) - Me.lbtitle.Name = "lbtitle" - Me.lbtitle.Size = New System.Drawing.Size(91, 14) - Me.lbtitle.TabIndex = 0 - Me.lbtitle.Text = "Color Picker" - ' 'pnlcolors ' Me.pnlcolors.Controls.Add(Me.btnwhite) @@ -229,31 +208,38 @@ Me.btncancel.Text = "Cancel" Me.btncancel.UseVisualStyleBackColor = True ' + 'pnltop + ' + Me.pnltop.AppName = "Color Picker" + Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top + Me.pnltop.Font = New System.Drawing.Font("Courier New", 8.25!) + Me.pnltop.ForeColor = System.Drawing.Color.White + Me.pnltop.Location = New System.Drawing.Point(0, 0) + Me.pnltop.Name = "pnltop" + Me.pnltop.Size = New System.Drawing.Size(362, 32) + Me.pnltop.TabIndex = 5 + ' 'ColorPicker ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 14.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.Black Me.ClientSize = New System.Drawing.Size(362, 280) + Me.Controls.Add(Me.pnltop) Me.Controls.Add(Me.btncancel) Me.Controls.Add(Me.lbselectedcolor) Me.Controls.Add(Me.btnok) Me.Controls.Add(Me.pnlcolors) - Me.Controls.Add(Me.pnltop) Me.Font = New System.Drawing.Font("Courier New", 8.25!) Me.ForeColor = System.Drawing.Color.White Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "ColorPicker" Me.Text = "ColorPicker" - Me.pnltop.ResumeLayout(False) - Me.pnltop.PerformLayout() Me.pnlcolors.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents pnltop As System.Windows.Forms.Panel - Friend WithEvents lbtitle As System.Windows.Forms.Label Friend WithEvents pnlcolors As System.Windows.Forms.FlowLayoutPanel Friend WithEvents btnwhite As System.Windows.Forms.Button Friend WithEvents btnblack As System.Windows.Forms.Button @@ -269,5 +255,6 @@ Friend WithEvents btnok As System.Windows.Forms.Button Friend WithEvents lbselectedcolor As System.Windows.Forms.Label Friend WithEvents btncancel As System.Windows.Forms.Button + Friend WithEvents pnltop As shiftos_next.Titlebar End Class End Namespace \ No newline at end of file diff --git a/shiftos_next/Terminal.Designer.vb b/shiftos_next/Terminal.Designer.vb index 7509fc4..61e68b7 100644 --- a/shiftos_next/Terminal.Designer.vb +++ b/shiftos_next/Terminal.Designer.vb @@ -25,9 +25,7 @@ Partial Class Terminal Me.components = New System.ComponentModel.Container() Me.terminaltext = New System.Windows.Forms.TextBox() Me.tmrfirstuse = New System.Windows.Forms.Timer(Me.components) - Me.pnltop = New System.Windows.Forms.Panel() - Me.lbtitle = New System.Windows.Forms.Label() - Me.pnltop.SuspendLayout() + Me.pnltop = New shiftos_next.Titlebar() Me.SuspendLayout() ' 'terminaltext @@ -38,10 +36,10 @@ Partial Class Terminal Me.terminaltext.Dock = System.Windows.Forms.DockStyle.Fill Me.terminaltext.Font = New System.Drawing.Font("Courier New", 8.25!) Me.terminaltext.ForeColor = System.Drawing.Color.White - Me.terminaltext.Location = New System.Drawing.Point(0, 30) + Me.terminaltext.Location = New System.Drawing.Point(0, 32) Me.terminaltext.Multiline = True Me.terminaltext.Name = "terminaltext" - Me.terminaltext.Size = New System.Drawing.Size(635, 388) + Me.terminaltext.Size = New System.Drawing.Size(635, 386) Me.terminaltext.TabIndex = 0 Me.terminaltext.Text = "ShiftOS Beta 1.0" ' @@ -51,25 +49,15 @@ Partial Class Terminal ' 'pnltop ' - Me.pnltop.BackColor = System.Drawing.Color.Gray - Me.pnltop.Controls.Add(Me.lbtitle) + Me.pnltop.AppName = "Terminal" Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top Me.pnltop.Font = New System.Drawing.Font("Courier New", 8.25!) Me.pnltop.ForeColor = System.Drawing.Color.White Me.pnltop.Location = New System.Drawing.Point(0, 0) Me.pnltop.Name = "pnltop" - Me.pnltop.Size = New System.Drawing.Size(635, 30) + Me.pnltop.Size = New System.Drawing.Size(635, 32) Me.pnltop.TabIndex = 1 ' - 'lbtitle - ' - Me.lbtitle.AutoSize = True - Me.lbtitle.Location = New System.Drawing.Point(12, 9) - Me.lbtitle.Name = "lbtitle" - Me.lbtitle.Size = New System.Drawing.Size(63, 14) - Me.lbtitle.TabIndex = 0 - Me.lbtitle.Text = "Terminal" - ' 'Terminal ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -81,14 +69,11 @@ Partial Class Terminal Me.Name = "Terminal" Me.Text = "Terminal" Me.WindowState = System.Windows.Forms.FormWindowState.Maximized - Me.pnltop.ResumeLayout(False) - Me.pnltop.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents terminaltext As System.Windows.Forms.TextBox Friend WithEvents tmrfirstuse As System.Windows.Forms.Timer - Friend WithEvents pnltop As System.Windows.Forms.Panel - Friend WithEvents lbtitle As System.Windows.Forms.Label + Friend WithEvents pnltop As shiftos_next.Titlebar End Class diff --git a/shiftos_next/Terminal.vb b/shiftos_next/Terminal.vb index 50df6bc..25a3e21 100644 --- a/shiftos_next/Terminal.vb +++ b/shiftos_next/Terminal.vb @@ -17,15 +17,7 @@ Public Sub terminal_Innitiate(sender As Object, e As EventArgs) Handles MyBase.Load Me.FormBorderStyle = Windows.Forms.FormBorderStyle.None API.txtterm = Me.terminaltext - If boughtbasicwm = True Then - pnltop.Show() - Me.WindowState = FormWindowState.Normal - Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2 - Me.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2 - Else - pnltop.Hide() - Me.WindowState = FormWindowState.Maximized - End If + pnltop.DetermineMyVisibility() AddLine(username + "@" + osname + " " & currentdir.ToLower.Replace("c:\shiftos", "~") & "$> ") SelectBottom() If prompttoupdatesave = True Then diff --git a/shiftos_next/TextPad.Designer.vb b/shiftos_next/TextPad.Designer.vb index 2db0d56..d43bc67 100644 --- a/shiftos_next/TextPad.Designer.vb +++ b/shiftos_next/TextPad.Designer.vb @@ -41,17 +41,15 @@ Partial Class TextPad Me.FindToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ReplaceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.txtfilebody = New System.Windows.Forms.RichTextBox() - Me.lbtitle = New System.Windows.Forms.Label() - Me.pnltop = New System.Windows.Forms.Panel() + Me.pnltop = New shiftos_next.Titlebar() Me.MenuStrip1.SuspendLayout() - Me.pnltop.SuspendLayout() Me.SuspendLayout() ' 'MenuStrip1 ' Me.MenuStrip1.Font = New System.Drawing.Font("Courier New", 8.25!) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.EditToolStripMenuItem}) - Me.MenuStrip1.Location = New System.Drawing.Point(0, 30) + Me.MenuStrip1.Location = New System.Drawing.Point(0, 32) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Size = New System.Drawing.Size(652, 24) Me.MenuStrip1.TabIndex = 0 @@ -165,29 +163,21 @@ Partial Class TextPad Me.txtfilebody.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtfilebody.Dock = System.Windows.Forms.DockStyle.Fill Me.txtfilebody.ForeColor = System.Drawing.Color.White - Me.txtfilebody.Location = New System.Drawing.Point(0, 54) + Me.txtfilebody.Location = New System.Drawing.Point(0, 56) Me.txtfilebody.Name = "txtfilebody" - Me.txtfilebody.Size = New System.Drawing.Size(652, 263) + Me.txtfilebody.Size = New System.Drawing.Size(652, 261) Me.txtfilebody.TabIndex = 1 Me.txtfilebody.Text = "" ' - 'lbtitle - ' - Me.lbtitle.AutoSize = True - Me.lbtitle.Location = New System.Drawing.Point(12, 9) - Me.lbtitle.Name = "lbtitle" - Me.lbtitle.Size = New System.Drawing.Size(56, 14) - Me.lbtitle.TabIndex = 0 - Me.lbtitle.Text = "TextPad" - ' 'pnltop ' - Me.pnltop.BackColor = System.Drawing.Color.Gray - Me.pnltop.Controls.Add(Me.lbtitle) + Me.pnltop.AppName = "TextPad" Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top + Me.pnltop.Font = New System.Drawing.Font("Courier New", 8.25!) + Me.pnltop.ForeColor = System.Drawing.Color.White Me.pnltop.Location = New System.Drawing.Point(0, 0) Me.pnltop.Name = "pnltop" - Me.pnltop.Size = New System.Drawing.Size(652, 30) + Me.pnltop.Size = New System.Drawing.Size(652, 32) Me.pnltop.TabIndex = 2 ' 'TextPad @@ -207,8 +197,6 @@ Partial Class TextPad Me.Text = "TextPad" Me.MenuStrip1.ResumeLayout(False) Me.MenuStrip1.PerformLayout() - Me.pnltop.ResumeLayout(False) - Me.pnltop.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -232,6 +220,5 @@ Partial Class TextPad Friend WithEvents FindToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ReplaceToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents txtfilebody As System.Windows.Forms.RichTextBox - Friend WithEvents lbtitle As System.Windows.Forms.Label - Friend WithEvents pnltop As System.Windows.Forms.Panel + Friend WithEvents pnltop As shiftos_next.Titlebar End Class diff --git a/shiftos_next/TextPad.vb b/shiftos_next/TextPad.vb index f0b956c..1bc0d28 100644 --- a/shiftos_next/TextPad.vb +++ b/shiftos_next/TextPad.vb @@ -60,18 +60,7 @@ Private Sub TextPad_Load(sender As Object, e As EventArgs) Handles Me.Load MenuStrip1.Renderer = New basicwm_renderer() setupmenufonts() - Me.WindowState = FormWindowState.Maximized - If boughtbasicwm = True Then - pnltop.Show() - Me.WindowState = FormWindowState.Normal - Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2 - Me.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2 - Me.TopMost = True - Else - pnltop.Hide() - Me.WindowState = FormWindowState.Maximized - Me.TopMost = False - End If + pnltop.DetermineMyVisibility() End Sub Public Sub setupmenufonts() diff --git a/shiftos_next/bin/Debug/shiftos_next.exe b/shiftos_next/bin/Debug/shiftos_next.exe index 752a092..bc00aab 100644 Binary files a/shiftos_next/bin/Debug/shiftos_next.exe and b/shiftos_next/bin/Debug/shiftos_next.exe differ diff --git a/shiftos_next/bin/Debug/shiftos_next.pdb b/shiftos_next/bin/Debug/shiftos_next.pdb index 8afd423..7ee40d3 100644 Binary files a/shiftos_next/bin/Debug/shiftos_next.pdb and b/shiftos_next/bin/Debug/shiftos_next.pdb differ diff --git a/shiftos_next/file skimmer.Designer.vb b/shiftos_next/file skimmer.Designer.vb index 506ce1b..4d2aabd 100644 --- a/shiftos_next/file skimmer.Designer.vb +++ b/shiftos_next/file skimmer.Designer.vb @@ -45,12 +45,10 @@ Partial Class file_skimmer Me.txtfilename = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.btnsave = New System.Windows.Forms.Button() - Me.lbtitle = New System.Windows.Forms.Label() - Me.pnltop = New System.Windows.Forms.Panel() + Me.pnltop = New shiftos_next.Titlebar() Me.topmenu.SuspendLayout() Me.tools.SuspendLayout() Me.pnlsave.SuspendLayout() - Me.pnltop.SuspendLayout() Me.SuspendLayout() ' 'topmenu @@ -59,7 +57,7 @@ Partial Class file_skimmer Me.topmenu.Font = New System.Drawing.Font("Courier New", 8.25!) Me.topmenu.ForeColor = System.Drawing.Color.White Me.topmenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.AboutToolStripMenuItem}) - Me.topmenu.Location = New System.Drawing.Point(0, 30) + Me.topmenu.Location = New System.Drawing.Point(0, 32) Me.topmenu.Name = "topmenu" Me.topmenu.Size = New System.Drawing.Size(591, 24) Me.topmenu.TabIndex = 0 @@ -121,7 +119,7 @@ Partial Class file_skimmer Me.tools.Font = New System.Drawing.Font("Courier New", 8.25!) Me.tools.ForeColor = System.Drawing.Color.White Me.tools.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel1, Me.lbcurrentdir, Me.ToolStripSeparator1, Me.btnnewfolder, Me.btndelete}) - Me.tools.Location = New System.Drawing.Point(0, 54) + Me.tools.Location = New System.Drawing.Point(0, 56) Me.tools.Name = "tools" Me.tools.Size = New System.Drawing.Size(591, 25) Me.tools.TabIndex = 1 @@ -169,9 +167,9 @@ Partial Class file_skimmer Me.lvfiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) Me.lvfiles.Dock = System.Windows.Forms.DockStyle.Fill Me.lvfiles.ForeColor = System.Drawing.Color.White - Me.lvfiles.Location = New System.Drawing.Point(0, 79) + Me.lvfiles.Location = New System.Drawing.Point(0, 81) Me.lvfiles.Name = "lvfiles" - Me.lvfiles.Size = New System.Drawing.Size(591, 251) + Me.lvfiles.Size = New System.Drawing.Size(591, 249) Me.lvfiles.TabIndex = 3 Me.lvfiles.UseCompatibleStateImageBehavior = False Me.lvfiles.View = System.Windows.Forms.View.Tile @@ -216,23 +214,15 @@ Partial Class file_skimmer Me.btnsave.Text = "Save" Me.btnsave.UseVisualStyleBackColor = True ' - 'lbtitle - ' - Me.lbtitle.AutoSize = True - Me.lbtitle.Location = New System.Drawing.Point(12, 9) - Me.lbtitle.Name = "lbtitle" - Me.lbtitle.Size = New System.Drawing.Size(91, 14) - Me.lbtitle.TabIndex = 0 - Me.lbtitle.Text = "File Skimmer" - ' 'pnltop ' - Me.pnltop.BackColor = System.Drawing.Color.Gray - Me.pnltop.Controls.Add(Me.lbtitle) + Me.pnltop.AppName = "File Skimmer" Me.pnltop.Dock = System.Windows.Forms.DockStyle.Top + Me.pnltop.Font = New System.Drawing.Font("Courier New", 8.25!) + Me.pnltop.ForeColor = System.Drawing.Color.White Me.pnltop.Location = New System.Drawing.Point(0, 0) Me.pnltop.Name = "pnltop" - Me.pnltop.Size = New System.Drawing.Size(591, 30) + Me.pnltop.Size = New System.Drawing.Size(591, 32) Me.pnltop.TabIndex = 5 ' 'file_skimmer @@ -260,8 +250,6 @@ Partial Class file_skimmer Me.tools.PerformLayout() Me.pnlsave.ResumeLayout(False) Me.pnlsave.PerformLayout() - Me.pnltop.ResumeLayout(False) - Me.pnltop.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -288,6 +276,5 @@ Partial Class file_skimmer Friend WithEvents txtfilename As System.Windows.Forms.TextBox Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents btnsave As System.Windows.Forms.Button - Friend WithEvents lbtitle As System.Windows.Forms.Label - Friend WithEvents pnltop As System.Windows.Forms.Panel + Friend WithEvents pnltop As shiftos_next.Titlebar End Class diff --git a/shiftos_next/file skimmer.vb b/shiftos_next/file skimmer.vb index 3ca3602..4b2d9b1 100644 --- a/shiftos_next/file skimmer.vb +++ b/shiftos_next/file skimmer.vb @@ -123,17 +123,7 @@ Else pnlsave.Visible = False End If - If boughtbasicwm = True Then - pnltop.Show() - Me.WindowState = FormWindowState.Normal - Me.Left = (Screen.PrimaryScreen.Bounds.Width - Me.Width) / 2 - Me.Top = (Screen.PrimaryScreen.Bounds.Height - Me.Height) / 2 - Me.TopMost = True - Else - pnltop.Hide() - Me.WindowState = FormWindowState.Maximized - Me.TopMost = False - End If + pnltop.DetermineMyVisibility() End Sub Private Sub ExitSessionToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExitSessionToolStripMenuItem.Click diff --git a/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 701763f..ee2f7a0 100644 Binary files a/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/shiftos_next/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/shiftos_next/obj/Debug/shiftos_next.Titlebar.resources b/shiftos_next/obj/Debug/shiftos_next.Titlebar.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/shiftos_next/obj/Debug/shiftos_next.Titlebar.resources differ diff --git a/shiftos_next/obj/Debug/shiftos_next.exe b/shiftos_next/obj/Debug/shiftos_next.exe index 752a092..bc00aab 100644 Binary files a/shiftos_next/obj/Debug/shiftos_next.exe and b/shiftos_next/obj/Debug/shiftos_next.exe differ diff --git a/shiftos_next/obj/Debug/shiftos_next.pdb b/shiftos_next/obj/Debug/shiftos_next.pdb index 8afd423..7ee40d3 100644 Binary files a/shiftos_next/obj/Debug/shiftos_next.pdb and b/shiftos_next/obj/Debug/shiftos_next.pdb differ diff --git a/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt b/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt index 23ad026..59066c9 100644 --- a/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt +++ b/shiftos_next/obj/Debug/shiftos_next.vbproj.FileListAbsolute.txt @@ -43,3 +43,4 @@ C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\obj\Debug\shiftos_ne C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\bin\Debug\shiftos_next.exe C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\bin\Debug\shiftos_next.pdb C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\bin\Debug\shiftos_next.xml +C:\Users\Michael\Documents\GitHub\shiftos-next\shiftos_next\obj\Debug\shiftos_next.Titlebar.resources diff --git a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache index 523e144..4a8c593 100644 Binary files a/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache and b/shiftos_next/obj/Debug/shiftos_next.vbproj.GenerateResource.Cache differ diff --git a/shiftos_next/shiftos_next.vbproj b/shiftos_next/shiftos_next.vbproj index ce0ebfb..35221e0 100644 --- a/shiftos_next/shiftos_next.vbproj +++ b/shiftos_next/shiftos_next.vbproj @@ -79,6 +79,12 @@ Form + + Titlebar.vb + + + UserControl + BWMDesktop.vb @@ -145,6 +151,9 @@ basicwm_infobox.vb + + Titlebar.vb + BWMDesktop.vb -- cgit v1.2.3