diff --git a/Application/RSBot/Views/Main.Designer.cs b/Application/RSBot/Views/Main.Designer.cs index 2ffc31ea..4ff264d3 100644 --- a/Application/RSBot/Views/Main.Designer.cs +++ b/Application/RSBot/Views/Main.Designer.cs @@ -83,9 +83,10 @@ private void InitializeComponent() stripStatus.ImageScalingSize = new System.Drawing.Size(17, 17); stripStatus.Items.AddRange(new ToolStripItem[] { lblIngameStatus, menuCurrentProfile }); stripStatus.LayoutStyle = ToolStripLayoutStyle.HorizontalStackWithOverflow; - stripStatus.Location = new System.Drawing.Point(0, 679); + stripStatus.Location = new System.Drawing.Point(0, 627); stripStatus.Name = "stripStatus"; - stripStatus.Size = new System.Drawing.Size(974, 22); + stripStatus.Padding = new Padding(1, 0, 18, 0); + stripStatus.Size = new System.Drawing.Size(932, 26); stripStatus.SizingGrip = false; stripStatus.TabIndex = 0; stripStatus.Tag = "private"; @@ -95,7 +96,7 @@ private void InitializeComponent() lblIngameStatus.BackColor = System.Drawing.Color.Transparent; lblIngameStatus.ForeColor = System.Drawing.Color.White; lblIngameStatus.Name = "lblIngameStatus"; - lblIngameStatus.Size = new System.Drawing.Size(73, 17); + lblIngameStatus.Size = new System.Drawing.Size(92, 20); lblIngameStatus.Text = "Not in game"; // // menuCurrentProfile @@ -103,7 +104,7 @@ private void InitializeComponent() menuCurrentProfile.Alignment = ToolStripItemAlignment.Right; menuCurrentProfile.ForeColor = System.Drawing.Color.White; menuCurrentProfile.Name = "menuCurrentProfile"; - menuCurrentProfile.Size = new System.Drawing.Size(97, 22); + menuCurrentProfile.Size = new System.Drawing.Size(122, 26); menuCurrentProfile.Text = "Profile: Default"; menuCurrentProfile.Click += menuSelectProfile_Click; // @@ -112,9 +113,10 @@ private void InitializeComponent() cosController.AutoSize = true; cosController.Dock = DockStyle.Top; cosController.Location = new System.Drawing.Point(0, 0); + cosController.Margin = new Padding(5); cosController.Name = "cosController"; - cosController.Padding = new Padding(3); - cosController.Size = new System.Drawing.Size(250, 70); + cosController.Padding = new Padding(4, 4, 4, 4); + cosController.Size = new System.Drawing.Size(312, 88); cosController.TabIndex = 9; cosController.Visible = false; // @@ -129,22 +131,24 @@ private void InitializeComponent() bottomPanel.Controls.Add(btnSave); bottomPanel.Controls.Add(btnStartStop); bottomPanel.Dock = DockStyle.Bottom; - bottomPanel.Location = new System.Drawing.Point(0, 627); + bottomPanel.Location = new System.Drawing.Point(0, 562); + bottomPanel.Margin = new Padding(4); bottomPanel.Name = "bottomPanel"; bottomPanel.Radius = 0; bottomPanel.ShadowDepth = 8F; - bottomPanel.Size = new System.Drawing.Size(974, 52); + bottomPanel.Size = new System.Drawing.Size(932, 65); bottomPanel.TabIndex = 2; // // buttonConfig // buttonConfig.Color = System.Drawing.Color.Transparent; buttonConfig.Font = new System.Drawing.Font("Webdings", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - buttonConfig.Location = new System.Drawing.Point(249, 15); + buttonConfig.Location = new System.Drawing.Point(311, 19); + buttonConfig.Margin = new Padding(4); buttonConfig.Name = "buttonConfig"; buttonConfig.Radius = 6; buttonConfig.ShadowDepth = 4F; - buttonConfig.Size = new System.Drawing.Size(25, 23); + buttonConfig.Size = new System.Drawing.Size(31, 29); buttonConfig.TabIndex = 12; buttonConfig.Text = "@"; buttonConfig.UseVisualStyleBackColor = true; @@ -158,11 +162,12 @@ private void InitializeComponent() comboServer.FormattingEnabled = true; comboServer.IntegralHeight = false; comboServer.ItemHeight = 17; - comboServer.Location = new System.Drawing.Point(111, 15); + comboServer.Location = new System.Drawing.Point(139, 19); + comboServer.Margin = new Padding(4); comboServer.Name = "comboServer"; comboServer.Radius = 5; comboServer.ShadowDepth = 4F; - comboServer.Size = new System.Drawing.Size(132, 23); + comboServer.Size = new System.Drawing.Size(164, 23); comboServer.TabIndex = 11; comboServer.SelectedIndexChanged += comboServer_SelectedIndexChanged; // @@ -174,11 +179,12 @@ private void InitializeComponent() comboDivision.FormattingEnabled = true; comboDivision.IntegralHeight = false; comboDivision.ItemHeight = 17; - comboDivision.Location = new System.Drawing.Point(14, 15); + comboDivision.Location = new System.Drawing.Point(18, 19); + comboDivision.Margin = new Padding(4); comboDivision.Name = "comboDivision"; comboDivision.Radius = 5; comboDivision.ShadowDepth = 4F; - comboDivision.Size = new System.Drawing.Size(91, 23); + comboDivision.Size = new System.Drawing.Size(113, 23); comboDivision.TabIndex = 10; comboDivision.SelectedIndexChanged += comboDivision_SelectedIndexChanged; // @@ -188,11 +194,12 @@ private void InitializeComponent() btnSave.Color = System.Drawing.Color.FromArgb(56, 155, 90); btnSave.Font = new System.Drawing.Font("Segoe UI Semibold", 9.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); btnSave.ForeColor = System.Drawing.Color.White; - btnSave.Location = new System.Drawing.Point(753, 12); + btnSave.Location = new System.Drawing.Point(655, 15); + btnSave.Margin = new Padding(4); btnSave.Name = "btnSave"; btnSave.Radius = 6; btnSave.ShadowDepth = 4F; - btnSave.Size = new System.Drawing.Size(100, 27); + btnSave.Size = new System.Drawing.Size(125, 34); btnSave.TabIndex = 1; btnSave.TabStop = false; btnSave.Tag = "private"; @@ -208,11 +215,12 @@ private void InitializeComponent() btnStartStop.Color = System.Drawing.Color.FromArgb(33, 150, 243); btnStartStop.Font = new System.Drawing.Font("Segoe UI Semibold", 9.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); btnStartStop.ForeColor = System.Drawing.Color.White; - btnStartStop.Location = new System.Drawing.Point(859, 12); + btnStartStop.Location = new System.Drawing.Point(788, 15); + btnStartStop.Margin = new Padding(4); btnStartStop.Name = "btnStartStop"; btnStartStop.Radius = 6; btnStartStop.ShadowDepth = 4F; - btnStartStop.Size = new System.Drawing.Size(100, 27); + btnStartStop.Size = new System.Drawing.Size(125, 34); btnStartStop.TabIndex = 0; btnStartStop.TabStop = false; btnStartStop.Tag = "private"; @@ -229,30 +237,32 @@ private void InitializeComponent() pSidebar.Controls.Add(entity1); pSidebar.Controls.Add(cosController); pSidebar.Dock = DockStyle.Right; - pSidebar.Location = new System.Drawing.Point(724, 32); + pSidebar.Location = new System.Drawing.Point(620, 40); + pSidebar.Margin = new Padding(4); pSidebar.Name = "pSidebar"; pSidebar.Radius = 0; pSidebar.ShadowDepth = 0F; - pSidebar.Size = new System.Drawing.Size(250, 595); + pSidebar.Size = new System.Drawing.Size(312, 522); pSidebar.TabIndex = 6; // // pSidebarCustom // pSidebarCustom.Dock = DockStyle.Fill; - pSidebarCustom.Location = new System.Drawing.Point(0, 153); - pSidebarCustom.Margin = new Padding(3, 30, 3, 3); + pSidebarCustom.Location = new System.Drawing.Point(0, 192); + pSidebarCustom.Margin = new Padding(4, 38, 4, 4); pSidebarCustom.Name = "pSidebarCustom"; - pSidebarCustom.Padding = new Padding(0, 16, 0, 0); - pSidebarCustom.Size = new System.Drawing.Size(250, 442); + pSidebarCustom.Padding = new Padding(0, 20, 0, 0); + pSidebarCustom.Size = new System.Drawing.Size(312, 330); pSidebarCustom.TabIndex = 14; // // entity1 // entity1.Dock = DockStyle.Top; - entity1.Location = new System.Drawing.Point(0, 70); - entity1.MinimumSize = new System.Drawing.Size(250, 76); + entity1.Location = new System.Drawing.Point(0, 88); + entity1.Margin = new Padding(5); + entity1.MinimumSize = new System.Drawing.Size(312, 95); entity1.Name = "entity1"; - entity1.Size = new System.Drawing.Size(250, 83); + entity1.Size = new System.Drawing.Size(312, 104); entity1.TabIndex = 10; // // botbase1ToolStripMenuItem1 @@ -282,14 +292,14 @@ private void InitializeComponent() fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { menuSelectProfile, networkConfigToolStripMenuItem, menuItemExit }); fileToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - fileToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + fileToolStripMenuItem.Size = new System.Drawing.Size(148, 26); fileToolStripMenuItem.Text = "File"; // // menuSelectProfile // menuSelectProfile.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); menuSelectProfile.Name = "menuSelectProfile"; - menuSelectProfile.Size = new System.Drawing.Size(160, 22); + menuSelectProfile.Size = new System.Drawing.Size(193, 26); menuSelectProfile.Text = "Select Profile..."; menuSelectProfile.Click += menuSelectProfile_Click; // @@ -297,7 +307,7 @@ private void InitializeComponent() // networkConfigToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); networkConfigToolStripMenuItem.Name = "networkConfigToolStripMenuItem"; - networkConfigToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + networkConfigToolStripMenuItem.Size = new System.Drawing.Size(193, 26); networkConfigToolStripMenuItem.Text = "Proxy Config"; networkConfigToolStripMenuItem.Click += networkConfigToolStripMenuItem_Click; // @@ -305,7 +315,7 @@ private void InitializeComponent() // menuItemExit.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); menuItemExit.Name = "menuItemExit"; - menuItemExit.Size = new System.Drawing.Size(160, 22); + menuItemExit.Size = new System.Drawing.Size(193, 26); menuItemExit.Text = "Exit"; menuItemExit.Click += menuItemExit_Click; // @@ -314,13 +324,13 @@ private void InitializeComponent() viewToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { menuSidebar }); viewToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - viewToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + viewToolStripMenuItem.Size = new System.Drawing.Size(148, 26); viewToolStripMenuItem.Text = "View"; // // menuSidebar // menuSidebar.Name = "menuSidebar"; - menuSidebar.Size = new System.Drawing.Size(121, 22); + menuSidebar.Size = new System.Drawing.Size(147, 26); menuSidebar.Text = "Sidebar"; menuSidebar.Click += menuSidebar_Click; // @@ -329,14 +339,14 @@ private void InitializeComponent() toolsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { menuScriptRecorder }); toolsToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - toolsToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + toolsToolStripMenuItem.Size = new System.Drawing.Size(148, 26); toolsToolStripMenuItem.Text = "Tools"; // // menuScriptRecorder // menuScriptRecorder.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); menuScriptRecorder.Name = "menuScriptRecorder"; - menuScriptRecorder.Size = new System.Drawing.Size(167, 22); + menuScriptRecorder.Size = new System.Drawing.Size(201, 26); menuScriptRecorder.Text = "Script Recorder"; menuScriptRecorder.Click += menuScriptRecorder_Click; // @@ -344,7 +354,7 @@ private void InitializeComponent() // menuPlugins.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); menuPlugins.Name = "menuPlugins"; - menuPlugins.Size = new System.Drawing.Size(133, 22); + menuPlugins.Size = new System.Drawing.Size(148, 26); menuPlugins.Text = "Plugins"; // // aboutToolStripMenuItem @@ -352,14 +362,14 @@ private void InitializeComponent() aboutToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { thisToolStripMenuItem }); aboutToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - aboutToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + aboutToolStripMenuItem.Size = new System.Drawing.Size(148, 26); aboutToolStripMenuItem.Text = "About"; // // thisToolStripMenuItem // thisToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); thisToolStripMenuItem.Name = "thisToolStripMenuItem"; - thisToolStripMenuItem.Size = new System.Drawing.Size(99, 22); + thisToolStripMenuItem.Size = new System.Drawing.Size(122, 26); thisToolStripMenuItem.Text = "This"; thisToolStripMenuItem.Click += menuItemThis_Click; // @@ -370,20 +380,20 @@ private void InitializeComponent() menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem, viewToolStripMenuItem, toolsToolStripMenuItem, menuPlugins, botsToolStripMenuItem, languageToolStripMenuItem, themeToolStripMenuItem, aboutToolStripMenuItem }); menuStrip.Name = "menuStrip"; - menuStrip.Size = new System.Drawing.Size(134, 180); + menuStrip.Size = new System.Drawing.Size(149, 212); // // botsToolStripMenuItem // botsToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); botsToolStripMenuItem.Name = "botsToolStripMenuItem"; - botsToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + botsToolStripMenuItem.Size = new System.Drawing.Size(148, 26); botsToolStripMenuItem.Text = "Bots"; // // languageToolStripMenuItem // languageToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); languageToolStripMenuItem.Name = "languageToolStripMenuItem"; - languageToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + languageToolStripMenuItem.Size = new System.Drawing.Size(148, 26); languageToolStripMenuItem.Text = "Language"; // // themeToolStripMenuItem @@ -391,14 +401,14 @@ private void InitializeComponent() themeToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { darkToolStripMenuItem, lightToolStripMenuItem, autoToolStripMenuItem, coloredToolStripMenuItem }); themeToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); themeToolStripMenuItem.Name = "themeToolStripMenuItem"; - themeToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + themeToolStripMenuItem.Size = new System.Drawing.Size(148, 26); themeToolStripMenuItem.Text = "Theme"; // // darkToolStripMenuItem // darkToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); darkToolStripMenuItem.Name = "darkToolStripMenuItem"; - darkToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + darkToolStripMenuItem.Size = new System.Drawing.Size(197, 26); darkToolStripMenuItem.Text = "Dark"; darkToolStripMenuItem.Click += darkToolStripMenuItem_Click; // @@ -406,7 +416,7 @@ private void InitializeComponent() // lightToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); lightToolStripMenuItem.Name = "lightToolStripMenuItem"; - lightToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + lightToolStripMenuItem.Size = new System.Drawing.Size(197, 26); lightToolStripMenuItem.Text = "Light"; lightToolStripMenuItem.Click += lightToolStripMenuItem_Click; // @@ -414,7 +424,7 @@ private void InitializeComponent() // autoToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - autoToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + autoToolStripMenuItem.Size = new System.Drawing.Size(197, 26); autoToolStripMenuItem.Text = "Auto"; autoToolStripMenuItem.Click += autoToolStripMenuItem_Click; // @@ -422,7 +432,7 @@ private void InitializeComponent() // coloredToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); coloredToolStripMenuItem.Name = "coloredToolStripMenuItem"; - coloredToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + coloredToolStripMenuItem.Size = new System.Drawing.Size(197, 26); coloredToolStripMenuItem.Text = "Choose a color"; coloredToolStripMenuItem.Click += coloredToolStripMenuItem_Click; // @@ -431,28 +441,29 @@ private void InitializeComponent() topCharacter.BackColor = System.Drawing.Color.Transparent; topCharacter.Dock = DockStyle.Top; topCharacter.Font = new System.Drawing.Font("Segoe UI", 9.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - topCharacter.Location = new System.Drawing.Point(0, 32); - topCharacter.Margin = new Padding(4); + topCharacter.Location = new System.Drawing.Point(0, 40); + topCharacter.Margin = new Padding(5); topCharacter.Name = "topCharacter"; - topCharacter.Size = new System.Drawing.Size(724, 74); + topCharacter.Size = new System.Drawing.Size(620, 92); topCharacter.TabIndex = 7; // // windowPageControl // windowPageControl.AutoScroll = true; windowPageControl.Dock = DockStyle.Fill; - windowPageControl.Location = new System.Drawing.Point(0, 106); + windowPageControl.Location = new System.Drawing.Point(0, 132); + windowPageControl.Margin = new Padding(4); windowPageControl.Name = "windowPageControl"; windowPageControl.SelectedIndex = -1; - windowPageControl.Size = new System.Drawing.Size(724, 521); + windowPageControl.Size = new System.Drawing.Size(620, 430); windowPageControl.TabIndex = 13; // // Main // - AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); AutoScaleMode = AutoScaleMode.Dpi; BackColor = System.Drawing.Color.FromArgb(0, 0, 0, 0); - ClientSize = new System.Drawing.Size(974, 701); + ClientSize = new System.Drawing.Size(932, 653); Controls.Add(windowPageControl); Controls.Add(topCharacter); Controls.Add(pSidebar); @@ -460,13 +471,13 @@ private void InitializeComponent() Controls.Add(stripStatus); ExtendBox = true; ExtendMenu = menuStrip; - ForeColor = System.Drawing.Color.Black; FullDrawHatch = true; Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); Location = new System.Drawing.Point(0, 0); + Margin = new Padding(4); Name = "Main"; StartPosition = FormStartPosition.CenterScreen; - Tag = "ee"; + Tag = ""; Text = "RSBot"; WindowPageControl = windowPageControl; FormClosing += Main_FormClosing; diff --git a/Application/RSBot/Views/Main.cs b/Application/RSBot/Views/Main.cs index 079e202e..b2db100c 100644 --- a/Application/RSBot/Views/Main.cs +++ b/Application/RSBot/Views/Main.cs @@ -78,7 +78,6 @@ private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceCha if (!detectDarkLight) return; - DwmMargin = WindowsHelper.IsDark() ? -1 : 1; if (WindowsHelper.IsDark()) SetThemeColor(DarkThemeColor); else @@ -607,7 +606,6 @@ private void networkConfigToolStripMenuItem_Click(object sender, EventArgs e) private void darkToolStripMenuItem_Click(object sender, EventArgs e) { GlobalConfig.Set("RSBot.Theme.Auto", false); - DwmMargin = -1; SetThemeColor(DarkThemeColor); } @@ -619,7 +617,6 @@ private void darkToolStripMenuItem_Click(object sender, EventArgs e) private void lightToolStripMenuItem_Click(object sender, EventArgs e) { GlobalConfig.Set("RSBot.Theme.Auto", false); - DwmMargin = 1; SetThemeColor(LightThemeColor); } @@ -662,7 +659,6 @@ private void coloredToolStripMenuItem_Click(object sender, EventArgs e) if (colorDialog.ShowDialog() == DialogResult.OK) { GlobalConfig.SetArray("SDUI.CustomColors", colorDialog.CustomColors); - DwmMargin = colorDialog.Color.IsDark() ? -1 : 1; SetThemeColor(colorDialog.Color); } } diff --git a/Application/RSBot/Views/ScriptRecorder.Designer.cs b/Application/RSBot/Views/ScriptRecorder.Designer.cs index 0338707c..e8b66e45 100644 --- a/Application/RSBot/Views/ScriptRecorder.Designer.cs +++ b/Application/RSBot/Views/ScriptRecorder.Designer.cs @@ -251,6 +251,7 @@ private void InitializeComponent() Controls.Add(txtScript); Controls.Add(panel2); Controls.Add(panel1); + DwmMargin = -1; Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); Location = new System.Drawing.Point(0, 0); MaximizeBox = false; diff --git a/Plugins/RSBot.Map/Views/Main.cs b/Plugins/RSBot.Map/Views/Main.cs index 2cab60c8..5d4437a8 100644 --- a/Plugins/RSBot.Map/Views/Main.cs +++ b/Plugins/RSBot.Map/Views/Main.cs @@ -84,7 +84,7 @@ public Main() if (DesignMode) return; - _cachedImages = _cachedImages ?? new Dictionary(); + _cachedImages ??= new(); EventManager.SubscribeEvent("OnEnterGame", OnEnterGame); diff --git a/SDUI b/SDUI index 853bbbeb..a8c5914d 160000 --- a/SDUI +++ b/SDUI @@ -1 +1 @@ -Subproject commit 853bbbeb095245063bb885f19d67780a8071aae5 +Subproject commit a8c5914dfb8e6b8605c377c79655efc8f22e955b