Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-10 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

More theme tweaks for white theme

Browse source
This commit is contained in:
KillzXGaming 2019-10-19 20:59:34 -04:00
parent 7e736fd4c1
commit 4bea7a22f7
5 changed files with 99 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
File_Format_Library/GUI/BFLYT/Editor/Materials/PaneMatTextureMapsEditor.Designer.cs generated
View file

@ -58,6 +58,9 @@
this.stLabel5 = new Toolbox.Library.Forms.STLabel();
this.scaleYUD = new BarSlider.BarSlider();
this.scaleXUD = new BarSlider.BarSlider();
((System.ComponentModel.ISupportInitialize)(this.stPanel1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.stPanel2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.stPanel3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCustom1)).BeginInit();
this.stFlowLayoutPanel1.SuspendLayout();
this.stDropDownPanel1.SuspendLayout();
@ -124,8 +127,11 @@
this.stPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.stPanel1.Location = new System.Drawing.Point(82, 57);
this.stPanel1.Name = "stPanel1";
this.stPanel1.Selected = false;
this.stPanel1.Size = new System.Drawing.Size(56, 55);
this.stPanel1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.stPanel1.TabIndex = 0;
this.stPanel1.TabStop = false;
this.stPanel1.Click += new System.EventHandler(this.stPanel1_Click);
//
// stPanel2
@ -134,8 +140,11 @@
this.stPanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.stPanel2.Location = new System.Drawing.Point(147, 57);
this.stPanel2.Name = "stPanel2";
this.stPanel2.Selected = false;
this.stPanel2.Size = new System.Drawing.Size(56, 55);
this.stPanel2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.stPanel2.TabIndex = 1;
this.stPanel2.TabStop = false;
this.stPanel2.Click += new System.EventHandler(this.stPanel2_Click);
//
// stPanel3
@ -144,14 +153,18 @@
this.stPanel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.stPanel3.Location = new System.Drawing.Point(209, 57);
this.stPanel3.Name = "stPanel3";
this.stPanel3.Selected = false;
this.stPanel3.Size = new System.Drawing.Size(56, 55);
this.stPanel3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.stPanel3.TabIndex = 2;
this.stPanel3.TabStop = false;
this.stPanel3.Click += new System.EventHandler(this.stPanel3_Click);
//
// pictureBoxCustom1
//
this.pictureBoxCustom1.BackColor = System.Drawing.Color.Transparent;
this.pictureBoxCustom1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBoxCustom1.BackgroundImage")));
this.pictureBoxCustom1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBoxCustom1.Location = new System.Drawing.Point(14, 30);
this.pictureBoxCustom1.Name = "pictureBoxCustom1";
this.pictureBoxCustom1.Size = new System.Drawing.Size(154, 172);
@ -257,7 +270,6 @@
this.expandCB.Size = new System.Drawing.Size(142, 21);
this.expandCB.TabIndex = 12;
this.expandCB.SelectedIndexChanged += new System.EventHandler(this.textureSettingsCB_SelectedIndexChanged);
//
// stLabel4
//
@ -339,20 +351,18 @@
// rotUD
//
this.rotUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.rotUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.rotUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.rotUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.rotUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.rotUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.rotUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.rotUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.rotUD.BarPenColorTop = System.Drawing.Color.Empty;
this.rotUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.rotUD.DataType = null;
this.rotUD.DrawSemitransparentThumb = false;
this.rotUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.rotUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.rotUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.rotUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.rotUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.rotUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.rotUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.rotUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.rotUD.ForeColor = System.Drawing.Color.White;
this.rotUD.IncrementAmount = 0.01F;
this.rotUD.InputName = "";
this.rotUD.LargeChange = 5F;
@ -384,20 +394,18 @@
// transYUD
//
this.transYUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.transYUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transYUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.transYUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.transYUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.transYUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.transYUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.transYUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.transYUD.BarPenColorTop = System.Drawing.Color.Empty;
this.transYUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.transYUD.DataType = null;
this.transYUD.DrawSemitransparentThumb = false;
this.transYUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transYUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transYUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.transYUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transYUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.transYUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.transYUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.transYUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.transYUD.ForeColor = System.Drawing.Color.White;
this.transYUD.IncrementAmount = 0.01F;
this.transYUD.InputName = "V";
this.transYUD.LargeChange = 5F;
@ -429,20 +437,18 @@
// transXUD
//
this.transXUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.transXUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transXUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.transXUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.transXUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.transXUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.transXUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.transXUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.transXUD.BarPenColorTop = System.Drawing.Color.Empty;
this.transXUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.transXUD.DataType = null;
this.transXUD.DrawSemitransparentThumb = false;
this.transXUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transXUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transXUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.transXUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.transXUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.transXUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.transXUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.transXUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.transXUD.ForeColor = System.Drawing.Color.White;
this.transXUD.IncrementAmount = 0.01F;
this.transXUD.InputName = "U";
this.transXUD.LargeChange = 5F;
@ -501,20 +507,18 @@
// scaleYUD
//
this.scaleYUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.scaleYUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleYUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.scaleYUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.scaleYUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.scaleYUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.scaleYUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.scaleYUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.scaleYUD.BarPenColorTop = System.Drawing.Color.Empty;
this.scaleYUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.scaleYUD.DataType = null;
this.scaleYUD.DrawSemitransparentThumb = false;
this.scaleYUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleYUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleYUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.scaleYUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleYUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.scaleYUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.scaleYUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.scaleYUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.scaleYUD.ForeColor = System.Drawing.Color.White;
this.scaleYUD.IncrementAmount = 0.01F;
this.scaleYUD.InputName = "V";
this.scaleYUD.LargeChange = 5F;
@ -546,20 +550,18 @@
// scaleXUD
//
this.scaleXUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.scaleXUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleXUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.scaleXUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.scaleXUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.scaleXUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.scaleXUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.scaleXUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.scaleXUD.BarPenColorTop = System.Drawing.Color.Empty;
this.scaleXUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.scaleXUD.DataType = null;
this.scaleXUD.DrawSemitransparentThumb = false;
this.scaleXUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleXUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleXUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.scaleXUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.scaleXUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.scaleXUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.scaleXUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.scaleXUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.scaleXUD.ForeColor = System.Drawing.Color.White;
this.scaleXUD.IncrementAmount = 0.01F;
this.scaleXUD.InputName = "U";
this.scaleXUD.LargeChange = 5F;
@ -595,6 +597,9 @@
this.Controls.Add(this.stFlowLayoutPanel1);
this.Name = "PaneMatTextureMapsEditor";
this.Size = new System.Drawing.Size(408, 668);
((System.ComponentModel.ISupportInitialize)(this.stPanel1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.stPanel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.stPanel3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCustom1)).EndInit();
this.stFlowLayoutPanel1.ResumeLayout(false);
this.stDropDownPanel1.ResumeLayout(false);

21
Switch_Toolbox_Library/FormThemes.cs
View file

@ -49,7 +49,7 @@ namespace Toolbox.Library.Forms
BaseTheme.ListViewBackColor = Color.White;
BaseTheme.DropdownButtonBackColor = Color.FromArgb(220, 220, 220);
BaseTheme.DropdownButtonBackColor = Color.FromArgb(190, 190, 190);
BaseTheme.DropdownPanelBackColor = Color.White;
BaseTheme.DropdownPanelBackColor = Color.White;
@ -73,13 +73,15 @@ namespace Toolbox.Library.Forms
BaseTheme.ValueBarSliderElapseMiddleColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderElapseBottmColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderTopColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderMiddleColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderBottmColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderTopColor = Color.FromArgb(190, 190, 190);
BaseTheme.ValueBarSliderMiddleColor = Color.FromArgb(190, 190, 190);
BaseTheme.ValueBarSliderBottmColor = Color.FromArgb(190, 190, 190);
BaseTheme.ValueBarSliderElapseTopColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderElapseMiddleColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderElapseBottmColor = Color.FromArgb(160, 160, 160);
BaseTheme.ValueBarSliderElapseTopColor = Color.FromArgb(190, 190, 190);
BaseTheme.ValueBarSliderElapseMiddleColor = Color.FromArgb(190, 190, 190);
BaseTheme.ValueBarSliderElapseBottmColor = Color.FromArgb(190, 190, 190);
BaseTheme.KeyFrameColor = Color.FromArgb(222, 222, 18);
//Timeline
@ -144,6 +146,9 @@ namespace Toolbox.Library.Forms
BaseTheme.TabPageActive = Color.FromArgb(60, 60, 60);
BaseTheme.TextForeColor = Color.White;
BaseTheme.KeyFrameColor = Color.FromArgb(150, 106, 18);
BaseTheme.TimelineBackColor = Color.FromArgb(50, 50, 50);
BaseTheme.TimelineOverlayColor = Color.FromArgb(20, 20, 20);
BaseTheme.TimelineLineColor = Color.FromArgb(30, 30, 30);
@ -207,6 +212,8 @@ namespace Toolbox.Library.Forms
public static Color TimelineLine2Color { get; set; }
public static Color TimelineNumberColor { get; set; }
public static Color KeyFrameColor { get; set; }
public static Font FontType { get; set; }
}
}

18
Switch_Toolbox_Library/Forms/Custom/BarSlider/BarSlider.cs
View file

@ -1253,15 +1253,15 @@ namespace BarSlider
public void SetKeyedTheme()
{
BackColor = Color.FromArgb(255, 150, 106, 18);
BarInnerColor = Color.FromArgb(255, 150, 106, 18);
BarPenColorBottom = Color.FromArgb(255, 150, 106, 18);
BarPenColorMiddle = Color.FromArgb(255, 150, 106, 18);
BarPenColorTop = Color.FromArgb(255, 150, 106, 18);
ElapsedInnerColor = Color.FromArgb(255, 150, 106, 18);
ElapsedPenColorBottom = Color.FromArgb(255, 150, 106, 18);
ElapsedPenColorMiddle = Color.FromArgb(255, 150, 106, 18);
ElapsedPenColorTop = Color.FromArgb(255, 150, 106, 18);
BackColor = FormThemes.BaseTheme.KeyFrameColor;
BarInnerColor = FormThemes.BaseTheme.KeyFrameColor;
BarPenColorBottom = FormThemes.BaseTheme.KeyFrameColor;
BarPenColorMiddle = FormThemes.BaseTheme.KeyFrameColor;
BarPenColorTop = FormThemes.BaseTheme.KeyFrameColor;
ElapsedInnerColor = FormThemes.BaseTheme.KeyFrameColor;
ElapsedPenColorBottom = FormThemes.BaseTheme.KeyFrameColor;
ElapsedPenColorMiddle = FormThemes.BaseTheme.KeyFrameColor;
ElapsedPenColorTop = FormThemes.BaseTheme.KeyFrameColor;
}
public void ReloadTheme()

26
Switch_Toolbox_Library/Forms/Viewport.Designer.cs generated
View file

@ -57,11 +57,11 @@
this.bottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.rightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.leftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.createScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resetPoseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.reloadShadersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.uVViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.createScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.stPanel1.SuspendLayout();
this.stContextMenuStrip1.SuspendLayout();
this.SuspendLayout();
@ -135,6 +135,7 @@
this.drawContainersCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.drawContainersCB.ButtonColor = System.Drawing.Color.Empty;
this.drawContainersCB.FormattingEnabled = true;
this.drawContainersCB.IsReadOnly = false;
this.drawContainersCB.Location = new System.Drawing.Point(93, 0);
this.drawContainersCB.Name = "drawContainersCB";
this.drawContainersCB.Size = new System.Drawing.Size(183, 21);
@ -154,6 +155,7 @@
//
// stContextMenuStrip1
//
this.stContextMenuStrip1.HighlightSelectedTab = false;
this.stContextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.viewToolStripMenuItem,
this.shadingToolStripMenuItem,
@ -198,7 +200,7 @@
this.toOriginToolStripMenuItem,
this.toActiveModelToolStripMenuItem});
this.resetCameraToolStripMenuItem.Name = "resetCameraToolStripMenuItem";
this.resetCameraToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.resetCameraToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
this.resetCameraToolStripMenuItem.Text = "Reset";
//
// toOriginToolStripMenuItem
@ -221,7 +223,7 @@
this.orbitToolStripMenuItem,
this.walkToolStripMenuItem});
this.modeToolStripMenuItem1.Name = "modeToolStripMenuItem1";
this.modeToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
this.modeToolStripMenuItem1.Size = new System.Drawing.Size(169, 22);
this.modeToolStripMenuItem1.Text = "Mode";
//
// orbitToolStripMenuItem
@ -244,7 +246,7 @@
this.orthographicToolStripMenuItem,
this.perspectiveToolStripMenuItem});
this.projectionToolStripMenuItem.Name = "projectionToolStripMenuItem";
this.projectionToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.projectionToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
this.projectionToolStripMenuItem.Text = "Projection";
//
// orthographicToolStripMenuItem
@ -271,7 +273,7 @@
this.rightToolStripMenuItem,
this.leftToolStripMenuItem});
this.orientationToolStripMenuItem.Name = "orientationToolStripMenuItem";
this.orientationToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.orientationToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
this.orientationToolStripMenuItem.Text = "Orientation";
//
// frontToolStripMenuItem
@ -316,6 +318,13 @@
this.leftToolStripMenuItem.Text = "Left";
this.leftToolStripMenuItem.Click += new System.EventHandler(this.leftToolStripMenuItem_Click);
//
// createScreenshotToolStripMenuItem
//
this.createScreenshotToolStripMenuItem.Name = "createScreenshotToolStripMenuItem";
this.createScreenshotToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
this.createScreenshotToolStripMenuItem.Text = "Create Screenshot";
this.createScreenshotToolStripMenuItem.Click += new System.EventHandler(this.createScreenshotToolStripMenuItem_Click);
//
// resetPoseToolStripMenuItem
//
this.resetPoseToolStripMenuItem.Name = "resetPoseToolStripMenuItem";
@ -345,13 +354,6 @@
this.uVViewerToolStripMenuItem.Text = "UV Viewer";
this.uVViewerToolStripMenuItem.Click += new System.EventHandler(this.uVViewerToolStripMenuItem_Click);
//
// createScreenshotToolStripMenuItem
//
this.createScreenshotToolStripMenuItem.Name = "createScreenshotToolStripMenuItem";
this.createScreenshotToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.createScreenshotToolStripMenuItem.Text = "Create Screenshot";
this.createScreenshotToolStripMenuItem.Click += new System.EventHandler(this.createScreenshotToolStripMenuItem_Click);
//
// Viewport
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

28
Switch_Toolbox_Library/Forms/Viewport.cs
View file

@ -49,6 +49,10 @@ namespace Toolbox.Library
this.DoubleBuffered = true;
InitializeComponent();
BackColor = FormThemes.BaseTheme.FormBackColor;
ForeColor = FormThemes.BaseTheme.FormForeColor;
LoadViewport();
LoadViewportRuntimeValues();
LoadShadingModes();
@ -110,7 +114,7 @@ namespace Toolbox.Library
drawContainersCB.Items.Clear();
drawContainersCB.Items.Add("All Active Drawables");
for (int i = 0; i < DrawableContainers.Count;i++)
for (int i = 0; i < DrawableContainers.Count; i++)
{
drawContainersCB.Items.Add(DrawableContainers[i].Name);
@ -134,7 +138,7 @@ namespace Toolbox.Library
{
if (Drawable is GL_EditorFramework.EditorDrawables.IEditableObject)
{
return scene.staticObjects.Contains(Drawable) ||
return scene.staticObjects.Contains(Drawable) ||
scene.objects.Contains((GL_EditorFramework.EditorDrawables.IEditableObject)Drawable);
}
else
@ -347,7 +351,7 @@ namespace Toolbox.Library
GL_ControlModern.Stereoscopy = Runtime.stereoscopy;
GL_ControlModern.ZNear = Runtime.CameraNear;
GL_ControlModern.ZFar = Runtime.CameraFar;
}
}
public void SetupViewportRuntimeValues()
@ -422,10 +426,10 @@ namespace Toolbox.Library
bool IsOrtho = orthographicToolStripMenuItem.Checked;
// if (GL_ControlModern != null)
// GL_ControlModern.UseOrthographicView = IsOrtho;
// else
// GL_ControlLegacy.UseOrthographicView = IsOrtho;
// if (GL_ControlModern != null)
// GL_ControlModern.UseOrthographicView = IsOrtho;
// else
// GL_ControlLegacy.UseOrthographicView = IsOrtho;
UpdateViewport();
}
@ -445,10 +449,10 @@ namespace Toolbox.Library
bool IsOrtho = orthographicToolStripMenuItem.Checked;
// if (GL_ControlModern != null)
// GL_ControlModern.UseOrthographicView = IsOrtho;
// else
// GL_ControlLegacy.UseOrthographicView = IsOrtho;
// if (GL_ControlModern != null)
// GL_ControlModern.UseOrthographicView = IsOrtho;
// else
// GL_ControlLegacy.UseOrthographicView = IsOrtho;
UpdateViewport();
}
@ -595,7 +599,7 @@ namespace Toolbox.Library
return;
var containers = GetActiveContainers();
if (containers.Count == 0) return;
if (containers?.Count == 0) return;
UVEditorForm uvEditor1 = new UVEditorForm();
uvEditor1.LoadEditor(containers);