mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-26 22:01:45 +00:00
Changed, Texture Browser: texture groups list can now be collapsed.
Fixed, Texture Browser: restored Tab key functionality yet again (I broke this in r2248...). Added a bit of boilerplate to some of Tag Explorer's settings. Internal: added CollapsibleSplitter control.
This commit is contained in:
MaxED
parent
d5ed2df436
commit
c40d054949
6 changed files with 1006 additions and 42 deletions
|
|
@ -691,6 +691,9 @@
|
|||
<DependentUpon>ActionSpecialHelpButton.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Controls\ButtonsNumericTextboxDesigner.cs" />
|
||||
<Compile Include="Controls\CollapsibleSplitter.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Controls\ColoredComboBox.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
|
|
|
|||
944
Source/Core/Controls/CollapsibleSplitter.cs
Normal file
944
Source/Core/Controls/CollapsibleSplitter.cs
Normal file
|
|
@ -0,0 +1,944 @@
|
|||
/*
|
||||
|
||||
Windows Forms Collapsible Splitter Control for .Net
|
||||
(http://www.codeproject.com/Articles/3025/Collapsible-Splitter-control-in-C)
|
||||
(c)Copyright 2002-2003 NJF (furty74@yahoo.com). All rights reserved.
|
||||
|
||||
Assembly Build Dependencies:
|
||||
CollapsibleSplitter.bmp
|
||||
|
||||
Version 1.1 Changes:
|
||||
OnPaint is now overridden instead of being a handled event, and the entire splitter is now painted rather than just the collpaser control
|
||||
The splitter rectangle is now correctly defined
|
||||
The Collapsed property was renamed to IsCollapsed, and the code changed so that no value needs to be set
|
||||
New visual styles added: Win9x, XP, DoubleDots and Lines
|
||||
|
||||
Version 1.11 Changes:
|
||||
The OnMouseMove event handler was updated to address a flickering issue discovered by John O'Byrne
|
||||
|
||||
Version 1.2 Changes:
|
||||
Added support for horizontal splitters
|
||||
|
||||
Version 1.21 Changes:
|
||||
Added support for inclusion as a VS.Net ToolBox control
|
||||
Added a ToolBox bitmap
|
||||
Removed extraneous overrides
|
||||
Added summaries
|
||||
|
||||
Version 1.22 Changes:
|
||||
Removed the ParentFolder from public properties - this is now set automatically in the OnHandleCreated event
|
||||
*Added expand/collapse animation code
|
||||
|
||||
Version 1.3 Changes:
|
||||
Added an optional 3D border
|
||||
General code and comment cleaning
|
||||
Flagged assembly with the CLSCompliant attribute
|
||||
Added a simple designer class to filter unwanted properties
|
||||
|
||||
*/
|
||||
|
||||
namespace CodeImp.DoomBuilder.Controls
|
||||
{
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
|
||||
#region Enums
|
||||
/// <summary>
|
||||
/// Enumeration to sepcify the visual style to be applied to the CollapsibleSplitter control
|
||||
/// </summary>
|
||||
public enum VisualStyles
|
||||
{
|
||||
Mozilla = 0,
|
||||
XP,
|
||||
Win9x,
|
||||
DoubleDots,
|
||||
Lines
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Enumeration to specify the current animation state of the control.
|
||||
/// </summary>
|
||||
public enum SplitterState
|
||||
{
|
||||
Collapsed = 0,
|
||||
Expanding,
|
||||
Expanded,
|
||||
Collapsing
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// A custom collapsible splitter that can resize, hide and show associated form controls
|
||||
/// </summary>
|
||||
//[ToolboxBitmap(typeof(CollapsibleSplitter))]
|
||||
[DesignerAttribute(typeof(CollapsibleSplitterDesigner))]
|
||||
public class CollapsibleSplitter : Splitter
|
||||
{
|
||||
#region Events
|
||||
|
||||
public event EventHandler CollapsedChanged; //mxd
|
||||
|
||||
#endregion
|
||||
|
||||
#region Private Properties
|
||||
|
||||
// declare and define some base properties
|
||||
private bool hot;
|
||||
private readonly Color hotColor = CalculateColor(SystemColors.Highlight, SystemColors.Window, 70);
|
||||
private Control controlToHide;
|
||||
private Rectangle rr;
|
||||
private Form parentForm;
|
||||
private bool expandParentForm;
|
||||
private VisualStyles visualStyle;
|
||||
|
||||
// Border added in version 1.3
|
||||
private Border3DStyle borderStyle = Border3DStyle.Flat;
|
||||
|
||||
// animation controls introduced in version 1.22
|
||||
private readonly Timer animationTimer;
|
||||
private int controlWidth;
|
||||
private int controlHeight;
|
||||
private int parentFormWidth;
|
||||
private int parentFormHeight;
|
||||
private SplitterState currentState;
|
||||
private int animationDelay = 20;
|
||||
private int animationStep = 20;
|
||||
private bool useAnimations;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Public Properties
|
||||
|
||||
/// <summary>
|
||||
/// The initial state of the Splitter. Set to True if the control to hide is not visible by default
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("False"),
|
||||
Description("The initial state of the Splitter. Set to True if the control to hide is not visible by default")]
|
||||
public bool IsCollapsed
|
||||
{
|
||||
get { return (this.controlToHide == null || !this.controlToHide.Visible); } //mxd
|
||||
set { if(this.controlToHide != null) ToggleSplitter(value); } //mxd
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The System.Windows.Forms.Control that the splitter will collapse
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue(""),
|
||||
Description("The System.Windows.Forms.Control that the splitter will collapse")]
|
||||
public Control ControlToHide
|
||||
{
|
||||
get{ return this.controlToHide; }
|
||||
set{ this.controlToHide = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Determines if the collapse and expanding actions will be animated
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("True"),
|
||||
Description("Determines if the collapse and expanding actions will be animated")]
|
||||
public bool UseAnimations
|
||||
{
|
||||
get { return this.useAnimations; }
|
||||
set { this.useAnimations = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The delay in millisenconds between animation steps
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("20"),
|
||||
Description("The delay in millisenconds between animation steps")]
|
||||
public int AnimationDelay
|
||||
{
|
||||
get{ return this.animationDelay; }
|
||||
set{ this.animationDelay = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The amount of pixels moved in each animation step
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("20"),
|
||||
Description("The amount of pixels moved in each animation step")]
|
||||
public int AnimationStep
|
||||
{
|
||||
get{ return this.animationStep; }
|
||||
set{ this.animationStep = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// When true the entire parent form will be expanded and collapsed, otherwise just the contol to expand will be changed
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("False"),
|
||||
Description("When true the entire parent form will be expanded and collapsed, otherwise just the contol to expand will be changed")]
|
||||
public bool ExpandParentForm
|
||||
{
|
||||
get{ return this.expandParentForm; }
|
||||
set{ this.expandParentForm = value; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The visual style that will be painted on the control
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("VisualStyles.XP"),
|
||||
Description("The visual style that will be painted on the control")]
|
||||
public VisualStyles VisualStyle
|
||||
{
|
||||
get{ return this.visualStyle; }
|
||||
set
|
||||
{
|
||||
this.visualStyle = value;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// An optional border style to paint on the control. Set to Flat for no border
|
||||
/// </summary>
|
||||
[Bindable(true), Category("Collapsing Options"), DefaultValue("System.Windows.Forms.Border3DStyle.Flat"),
|
||||
Description("An optional border style to paint on the control. Set to Flat for no border")]
|
||||
public Border3DStyle BorderStyle3D
|
||||
{
|
||||
get{ return this.borderStyle; }
|
||||
set
|
||||
{
|
||||
this.borderStyle = value;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Public Methods
|
||||
|
||||
public void ToggleState()
|
||||
{
|
||||
this.ToggleSplitter(controlToHide.Visible);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Constructor
|
||||
|
||||
public CollapsibleSplitter()
|
||||
{
|
||||
// Register mouse events
|
||||
this.Click += new System.EventHandler(OnClick);
|
||||
this.Resize += new System.EventHandler(OnResize);
|
||||
this.MouseLeave += new System.EventHandler(OnMouseLeave);
|
||||
this.MouseMove += new MouseEventHandler(OnMouseMove);
|
||||
|
||||
// Setup the animation timer control
|
||||
this.animationTimer = new Timer();
|
||||
this.animationTimer.Interval = animationDelay;
|
||||
this.animationTimer.Tick += new System.EventHandler(this.animationTimerTick);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Overrides
|
||||
|
||||
protected override void OnHandleCreated(EventArgs e)
|
||||
{
|
||||
base.OnHandleCreated(e);
|
||||
this.parentForm = this.FindForm();
|
||||
|
||||
// set the current state
|
||||
if(this.controlToHide != null)
|
||||
{
|
||||
if(this.controlToHide.Visible)
|
||||
{
|
||||
this.currentState = SplitterState.Expanded;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.currentState = SplitterState.Collapsed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnEnabledChanged(EventArgs e)
|
||||
{
|
||||
base.OnEnabledChanged(e);
|
||||
this.Invalidate();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Event Handlers
|
||||
|
||||
protected override void OnMouseDown(MouseEventArgs e)
|
||||
{
|
||||
// if the hider control isn't hot, let the base resize action occur
|
||||
if(this.controlToHide!= null)
|
||||
{
|
||||
if(!this.hot && this.controlToHide.Visible)
|
||||
{
|
||||
base.OnMouseDown(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnResize(object sender, System.EventArgs e)
|
||||
{
|
||||
this.Invalidate();
|
||||
}
|
||||
|
||||
// this method was updated in version 1.11 to fix a flickering problem
|
||||
// discovered by John O'Byrne
|
||||
private void OnMouseMove(object sender, MouseEventArgs e)
|
||||
{
|
||||
// check to see if the mouse cursor position is within the bounds of our control
|
||||
if(e.X >= rr.X && e.X <= rr.X + rr.Width && e.Y >= rr.Y && e.Y <= rr.Y + rr.Height)
|
||||
{
|
||||
if(!this.hot)
|
||||
{
|
||||
this.hot = true;
|
||||
this.Cursor = Cursors.Hand;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(this.hot)
|
||||
{
|
||||
this.hot = false;
|
||||
this.Invalidate();;
|
||||
}
|
||||
|
||||
this.Cursor = Cursors.Default;
|
||||
|
||||
if(controlToHide!= null)
|
||||
{
|
||||
if(!controlToHide.Visible)
|
||||
this.Cursor = Cursors.Default;
|
||||
else // Changed in v1.2 to support Horizontal Splitters
|
||||
{
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
this.Cursor = Cursors.VSplit;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Cursor = Cursors.HSplit;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnMouseLeave(object sender, EventArgs e)
|
||||
{
|
||||
// ensure that the hot state is removed
|
||||
this.hot = false;
|
||||
this.Invalidate();;
|
||||
}
|
||||
|
||||
private void OnClick(object sender, EventArgs e)
|
||||
{
|
||||
if(controlToHide!= null && hot &&
|
||||
currentState != SplitterState.Collapsing &&
|
||||
currentState != SplitterState.Expanding)
|
||||
{
|
||||
ToggleSplitter(controlToHide.Visible);
|
||||
}
|
||||
}
|
||||
|
||||
private void ToggleSplitter(bool collapse)
|
||||
{
|
||||
|
||||
// if an animation is currently in progress for this control, drop out
|
||||
if(currentState == SplitterState.Collapsing || currentState == SplitterState.Expanding)
|
||||
return;
|
||||
|
||||
controlWidth = controlToHide.Width;
|
||||
controlHeight = controlToHide.Height;
|
||||
|
||||
if(collapse)
|
||||
{
|
||||
if(useAnimations)
|
||||
{
|
||||
currentState = SplitterState.Collapsing;
|
||||
|
||||
if(parentForm != null)
|
||||
{
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
parentFormWidth = parentForm.Width - controlWidth;
|
||||
}
|
||||
else
|
||||
{
|
||||
parentFormHeight = parentForm.Height - controlHeight;
|
||||
}
|
||||
}
|
||||
|
||||
this.animationTimer.Enabled = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// no animations, so just toggle the visible state
|
||||
currentState = SplitterState.Collapsed;
|
||||
controlToHide.Visible = false;
|
||||
if(expandParentForm && parentForm != null)
|
||||
{
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
parentForm.Width -= controlToHide.Width;
|
||||
}
|
||||
else
|
||||
{
|
||||
parentForm.Height -= controlToHide.Height;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// control to hide is collapsed
|
||||
if(useAnimations)
|
||||
{
|
||||
currentState = SplitterState.Expanding;
|
||||
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
if(parentForm != null)
|
||||
{
|
||||
parentFormWidth = parentForm.Width + controlWidth;
|
||||
}
|
||||
controlToHide.Width = 0;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
if(parentForm != null)
|
||||
{
|
||||
parentFormHeight = parentForm.Height + controlHeight;
|
||||
}
|
||||
controlToHide.Height = 0;
|
||||
}
|
||||
controlToHide.Visible = true;
|
||||
this.animationTimer.Enabled = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// no animations, so just toggle the visible state
|
||||
currentState = SplitterState.Expanded;
|
||||
controlToHide.Visible = true;
|
||||
if(expandParentForm && parentForm != null)
|
||||
{
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
parentForm.Width += controlToHide.Width;
|
||||
}
|
||||
else
|
||||
{
|
||||
parentForm.Height += controlToHide.Height;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//mxd. Raise event
|
||||
if(CollapsedChanged != null) CollapsedChanged(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Implementation
|
||||
|
||||
#region Animation Timer Tick
|
||||
|
||||
private void animationTimerTick(object sender, EventArgs e)
|
||||
{
|
||||
switch(currentState)
|
||||
{
|
||||
case SplitterState.Collapsing:
|
||||
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
// vertical splitter
|
||||
if(controlToHide.Width > animationStep)
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Width -= animationStep;
|
||||
}
|
||||
controlToHide.Width -= animationStep;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Width = parentFormWidth;
|
||||
}
|
||||
controlToHide.Visible = false;
|
||||
animationTimer.Enabled = false;
|
||||
controlToHide.Width = controlWidth;
|
||||
currentState = SplitterState.Collapsed;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// horizontal splitter
|
||||
if(controlToHide.Height > animationStep)
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Height -= animationStep;
|
||||
}
|
||||
controlToHide.Height -= animationStep;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Height = parentFormHeight;
|
||||
}
|
||||
controlToHide.Visible = false;
|
||||
animationTimer.Enabled = false;
|
||||
controlToHide.Height = controlHeight;
|
||||
currentState = SplitterState.Collapsed;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case SplitterState.Expanding:
|
||||
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
// vertical splitter
|
||||
if(controlToHide.Width < (controlWidth - animationStep))
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Width += animationStep;
|
||||
}
|
||||
controlToHide.Width += animationStep;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Width = parentFormWidth;
|
||||
}
|
||||
controlToHide.Width = controlWidth;
|
||||
controlToHide.Visible = true;
|
||||
animationTimer.Enabled = false;
|
||||
currentState = SplitterState.Expanded;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// horizontal splitter
|
||||
if(controlToHide.Height < (controlHeight - animationStep))
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Height += animationStep;
|
||||
}
|
||||
controlToHide.Height += animationStep;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(expandParentForm && parentForm.WindowState != FormWindowState.Maximized
|
||||
&& parentForm != null)
|
||||
{
|
||||
parentForm.Height = parentFormHeight;
|
||||
}
|
||||
controlToHide.Height = controlHeight;
|
||||
controlToHide.Visible = true;
|
||||
animationTimer.Enabled = false;
|
||||
currentState = SplitterState.Expanded;
|
||||
this.Invalidate();
|
||||
}
|
||||
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Paint the control
|
||||
|
||||
// OnPaint is now an override rather than an event in version 1.1
|
||||
protected override void OnPaint(PaintEventArgs e)
|
||||
{
|
||||
// create a Graphics object
|
||||
Graphics g = e.Graphics;
|
||||
|
||||
// find the rectangle for the splitter and paint it
|
||||
Rectangle r = this.ClientRectangle; // fixed in version 1.1
|
||||
g.FillRectangle(new SolidBrush(this.BackColor), r);
|
||||
|
||||
#region Vertical Splitter
|
||||
// Check the docking style and create the control rectangle accordingly
|
||||
if(this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
|
||||
{
|
||||
// create a new rectangle in the vertical center of the splitter for our collapse control button
|
||||
rr = new Rectangle(r.X, (int)r.Y + ((r.Height - 115)/2), 8, 115);
|
||||
// force the width to 8px so that everything always draws correctly
|
||||
this.Width = 8;
|
||||
|
||||
// draw the background color for our control image
|
||||
if(hot)
|
||||
{
|
||||
g.FillRectangle(new SolidBrush(hotColor), new Rectangle(rr.X + 1, rr.Y, 6, 115));
|
||||
}
|
||||
else
|
||||
{
|
||||
g.FillRectangle(new SolidBrush(this.BackColor), new Rectangle(rr.X + 1, rr.Y, 6, 115));
|
||||
}
|
||||
|
||||
// draw the top & bottom lines for our control image
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark, 1), rr.X + 1, rr.Y, rr.X + rr.Width - 2, rr.Y);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark, 1), rr.X + 1, rr.Y + rr.Height, rr.X + rr.Width - 2, rr.Y + rr.Height);
|
||||
|
||||
if(this.Enabled)
|
||||
{
|
||||
// draw the arrows for our control image
|
||||
// the ArrowPointArray is a point array that defines an arrow shaped polygon
|
||||
g.FillPolygon(new SolidBrush(SystemColors.ControlDarkDark), ArrowPointArray(rr.X + 2, rr.Y + 3));
|
||||
g.FillPolygon(new SolidBrush(SystemColors.ControlDarkDark), ArrowPointArray(rr.X + 2, rr.Y + rr.Height - 9));
|
||||
}
|
||||
|
||||
// draw the dots for our control image using a loop
|
||||
int x = rr.X + 3;
|
||||
int y = rr.Y + 14;
|
||||
|
||||
// Visual Styles added in version 1.1
|
||||
switch(visualStyle)
|
||||
{
|
||||
case VisualStyles.Mozilla:
|
||||
|
||||
for(int i=0; i < 30; i++)
|
||||
{
|
||||
// light dot
|
||||
g.DrawLine(new Pen(SystemColors.ControlLightLight), x, y + (i*3), x+1, y + 1 + (i*3));
|
||||
// dark dot
|
||||
g.DrawLine(new Pen(SystemColors.ControlDarkDark), x+1, y + 1 + (i*3), x+2, y + 2 + (i*3));
|
||||
// overdraw the background color as we actually drew 2px diagonal lines, not just dots
|
||||
if(hot)
|
||||
{
|
||||
g.DrawLine(new Pen(hotColor), x+2, y + 1 + (i*3), x+2, y + 2 + (i*3));
|
||||
}
|
||||
else
|
||||
{
|
||||
g.DrawLine(new Pen(this.BackColor), x+2, y + 1 + (i*3), x+2, y + 2 + (i*3));
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case VisualStyles.DoubleDots:
|
||||
for(int i=0; i < 30; i++)
|
||||
{
|
||||
// light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLightLight), x, y + 1 + (i*3), 1, 1 );
|
||||
// dark dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlDark), x - 1, y +(i*3), 1, 1 );
|
||||
i++;
|
||||
// light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLightLight), x + 2, y + 1 + (i*3), 1, 1 );
|
||||
// dark dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlDark), x + 1, y + (i*3), 1, 1 );
|
||||
}
|
||||
break;
|
||||
|
||||
case VisualStyles.Win9x:
|
||||
|
||||
g.DrawLine(new Pen(SystemColors.ControlLightLight), x, y, x + 2, y);
|
||||
g.DrawLine(new Pen(SystemColors.ControlLightLight), x, y, x,y + 90);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x + 2, y, x + 2, y + 90);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x, y + 90, x + 2, y + 90);
|
||||
break;
|
||||
|
||||
case VisualStyles.XP:
|
||||
|
||||
for(int i=0; i < 18; i++)
|
||||
{
|
||||
// light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLight), x, y + (i*5), 2, 2 );
|
||||
// light light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLightLight), x + 1, y + 1 + (i*5), 1, 1 );
|
||||
// dark dark dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlDarkDark), x, y +(i*5), 1, 1 );
|
||||
// dark fill
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x, y + (i*5), x, y + (i*5) + 1);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x, y + (i*5), x + 1, y + (i*5));
|
||||
}
|
||||
break;
|
||||
|
||||
case VisualStyles.Lines:
|
||||
|
||||
for(int i=0; i < 44; i++)
|
||||
{
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x, y + (i*2), x + 2, y + (i*2));
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
// Added in version 1.3
|
||||
if(this.borderStyle != Border3DStyle.Flat)
|
||||
{
|
||||
// Paint the control border
|
||||
ControlPaint.DrawBorder3D(e.Graphics, this.ClientRectangle, this.borderStyle, Border3DSide.Left);
|
||||
ControlPaint.DrawBorder3D(e.Graphics, this.ClientRectangle, this.borderStyle, Border3DSide.Right);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
// Horizontal Splitter support added in v1.2
|
||||
|
||||
#region Horizontal Splitter
|
||||
|
||||
else if (this.Dock == DockStyle.Top || this.Dock == DockStyle.Bottom)
|
||||
{
|
||||
// create a new rectangle in the horizontal center of the splitter for our collapse control button
|
||||
rr = new Rectangle(r.X + ((r.Width - 115)/2), r.Y, 115, 8);
|
||||
// force the height to 8px
|
||||
this.Height = 8;
|
||||
|
||||
// draw the background color for our control image
|
||||
if(hot)
|
||||
{
|
||||
g.FillRectangle(new SolidBrush(hotColor), new Rectangle(rr.X, rr.Y + 1, 115, 6));
|
||||
}
|
||||
else
|
||||
{
|
||||
g.FillRectangle(new SolidBrush(this.BackColor), new Rectangle(rr.X, rr.Y + 1, 115, 6));
|
||||
}
|
||||
|
||||
// draw the left & right lines for our control image
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark, 1), rr.X, rr.Y + 1, rr.X, rr.Y + rr.Height - 2);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark, 1), rr.X + rr.Width, rr.Y + 1, rr.X + rr.Width, rr.Y + rr.Height - 2);
|
||||
|
||||
if(this.Enabled)
|
||||
{
|
||||
// draw the arrows for our control image
|
||||
// the ArrowPointArray is a point array that defines an arrow shaped polygon
|
||||
g.FillPolygon(new SolidBrush(SystemColors.ControlDarkDark), ArrowPointArray(rr.X + 3, rr.Y + 2));
|
||||
g.FillPolygon(new SolidBrush(SystemColors.ControlDarkDark), ArrowPointArray(rr.X + rr.Width - 9, rr.Y + 2));
|
||||
}
|
||||
|
||||
// draw the dots for our control image using a loop
|
||||
int x = rr.X + 14;
|
||||
int y = rr.Y + 3;
|
||||
|
||||
// Visual Styles added in version 1.1
|
||||
switch(visualStyle)
|
||||
{
|
||||
case VisualStyles.Mozilla:
|
||||
|
||||
for(int i=0; i < 30; i++)
|
||||
{
|
||||
// light dot
|
||||
g.DrawLine(new Pen(SystemColors.ControlLightLight), x + (i*3), y, x + 1 + (i*3), y + 1);
|
||||
// dark dot
|
||||
g.DrawLine(new Pen(SystemColors.ControlDarkDark), x + 1 + (i*3), y + 1, x + 2 + (i*3), y + 2);
|
||||
// overdraw the background color as we actually drew 2px diagonal lines, not just dots
|
||||
if(hot)
|
||||
{
|
||||
g.DrawLine(new Pen(hotColor), x + 1 + (i*3), y + 2, x + 2 + (i*3), y + 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
g.DrawLine(new Pen(this.BackColor), x + 1 + (i*3), y + 2, x + 2 + (i*3), y + 2);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case VisualStyles.DoubleDots:
|
||||
|
||||
for(int i=0; i < 30; i++)
|
||||
{
|
||||
// light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLightLight), x + 1 + (i*3), y, 1, 1 );
|
||||
// dark dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlDark), x + (i*3), y - 1, 1, 1 );
|
||||
i++;
|
||||
// light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLightLight), x + 1 + (i*3), y + 2, 1, 1 );
|
||||
// dark dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlDark), x + (i*3), y + 1, 1, 1 );
|
||||
}
|
||||
break;
|
||||
|
||||
case VisualStyles.Win9x:
|
||||
|
||||
g.DrawLine(new Pen(SystemColors.ControlLightLight), x, y, x, y + 2);
|
||||
g.DrawLine(new Pen(SystemColors.ControlLightLight), x, y, x + 88, y);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x, y + 2, x + 88, y + 2);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x + 88, y, x + 88, y + 2);
|
||||
break;
|
||||
|
||||
case VisualStyles.XP:
|
||||
|
||||
for(int i=0; i < 18; i++)
|
||||
{
|
||||
// light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLight), x + (i*5), y, 2, 2 );
|
||||
// light light dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlLightLight), x + 1 + (i*5), y + 1, 1, 1 );
|
||||
// dark dark dot
|
||||
g.DrawRectangle(new Pen(SystemColors.ControlDarkDark), x +(i*5), y, 1, 1 );
|
||||
// dark fill
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x + (i*5), y, x + (i*5) + 1, y);
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x + (i*5), y, x + (i*5), y + 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case VisualStyles.Lines:
|
||||
|
||||
for(int i=0; i < 44; i++)
|
||||
{
|
||||
g.DrawLine(new Pen(SystemColors.ControlDark), x + (i*2), y, x + (i*2), y + 2);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
// Added in version 1.3
|
||||
if(this.borderStyle != Border3DStyle.Flat)
|
||||
{
|
||||
// Paint the control border
|
||||
ControlPaint.DrawBorder3D(e.Graphics, this.ClientRectangle, this.borderStyle, Border3DSide.Top);
|
||||
ControlPaint.DrawBorder3D(e.Graphics, this.ClientRectangle, this.borderStyle, Border3DSide.Bottom);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
else
|
||||
{
|
||||
throw new Exception("The Collapsible Splitter control cannot have the Filled or None Dockstyle property");
|
||||
}
|
||||
|
||||
// dispose the Graphics object
|
||||
g.Dispose();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Arrow Polygon Array
|
||||
|
||||
// This creates a point array to draw a arrow-like polygon
|
||||
private Point[] ArrowPointArray(int x, int y)
|
||||
{
|
||||
Point[] point = new Point[3];
|
||||
|
||||
if(controlToHide!= null)
|
||||
{
|
||||
// decide which direction the arrow will point
|
||||
if (
|
||||
(this.Dock == DockStyle.Right && controlToHide.Visible)
|
||||
|| (this.Dock == DockStyle.Left && !controlToHide.Visible)
|
||||
)
|
||||
{
|
||||
// right arrow
|
||||
point[0] = new Point(x,y);
|
||||
point[1] = new Point(x + 3, y + 3);
|
||||
point[2] = new Point(x, y + 6);
|
||||
}
|
||||
else if (
|
||||
(this.Dock == DockStyle.Right && !controlToHide.Visible)
|
||||
|| (this.Dock == DockStyle.Left && controlToHide.Visible)
|
||||
)
|
||||
{
|
||||
// left arrow
|
||||
point[0] = new Point(x + 3 ,y);
|
||||
point[1] = new Point(x, y + 3);
|
||||
point[2] = new Point(x + 3, y + 6);
|
||||
}
|
||||
|
||||
// Up/Down arrows added in v1.2
|
||||
|
||||
else if (
|
||||
(this.Dock == DockStyle.Top && controlToHide.Visible)
|
||||
|| (this.Dock == DockStyle.Bottom && !controlToHide.Visible)
|
||||
)
|
||||
{
|
||||
// up arrow
|
||||
point[0] = new Point(x + 3, y);
|
||||
point[1] = new Point(x + 6, y + 4);
|
||||
point[2] = new Point(x, y + 4);
|
||||
}
|
||||
else if (
|
||||
(this.Dock == DockStyle.Top && !controlToHide.Visible)
|
||||
|| (this.Dock == DockStyle.Bottom && controlToHide.Visible)
|
||||
)
|
||||
{
|
||||
// down arrow
|
||||
point[0] = new Point(x,y);
|
||||
point[1] = new Point(x + 6, y);
|
||||
point[2] = new Point(x + 3, y + 3);
|
||||
}
|
||||
}
|
||||
|
||||
return point;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Color Calculator
|
||||
|
||||
// this method was borrowed from the RichUI Control library by Sajith M
|
||||
private static Color CalculateColor(Color front, Color back, int alpha)
|
||||
{
|
||||
// solid color obtained as a result of alpha-blending
|
||||
|
||||
Color frontColor = Color.FromArgb(255, front);
|
||||
Color backColor = Color.FromArgb(255, back);
|
||||
|
||||
float frontRed = frontColor.R;
|
||||
float frontGreen = frontColor.G;
|
||||
float frontBlue = frontColor.B;
|
||||
float backRed = backColor.R;
|
||||
float backGreen = backColor.G;
|
||||
float backBlue = backColor.B;
|
||||
|
||||
float fRed = frontRed*alpha/255 + backRed*((float)(255-alpha)/255);
|
||||
byte newRed = (byte)fRed;
|
||||
float fGreen = frontGreen*alpha/255 + backGreen*((float)(255-alpha)/255);
|
||||
byte newGreen = (byte)fGreen;
|
||||
float fBlue = frontBlue*alpha/255 + backBlue*((float)(255-alpha)/255);
|
||||
byte newBlue = (byte)fBlue;
|
||||
|
||||
return Color.FromArgb(255, newRed, newGreen, newBlue);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A simple designer class for the CollapsibleSplitter control to remove
|
||||
/// unwanted properties at design time.
|
||||
/// </summary>
|
||||
public class CollapsibleSplitterDesigner : System.Windows.Forms.Design.ControlDesigner
|
||||
{
|
||||
public CollapsibleSplitterDesigner()
|
||||
{
|
||||
}
|
||||
|
||||
protected override void PreFilterProperties(System.Collections.IDictionary properties)
|
||||
{
|
||||
properties.Remove("IsCollapsed");
|
||||
properties.Remove("BorderStyle");
|
||||
properties.Remove("Size");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
72
Source/Core/Windows/TextureBrowserForm.Designer.cs
generated
72
Source/Core/Windows/TextureBrowserForm.Designer.cs
generated
|
|
@ -35,17 +35,16 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.smallimages = new System.Windows.Forms.ImageList(this.components);
|
||||
this.tvTextureSets = new CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview();
|
||||
this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
||||
this.splitContainer = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer.Panel1.SuspendLayout();
|
||||
this.splitContainer.Panel2.SuspendLayout();
|
||||
this.splitContainer.SuspendLayout();
|
||||
this.splitter = new CodeImp.DoomBuilder.Controls.CollapsibleSplitter();
|
||||
this.panel = new System.Windows.Forms.Panel();
|
||||
this.panel.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// cancel
|
||||
//
|
||||
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.cancel.Location = new System.Drawing.Point(674, 411);
|
||||
this.cancel.Location = new System.Drawing.Point(683, 411);
|
||||
this.cancel.Name = "cancel";
|
||||
this.cancel.Size = new System.Drawing.Size(98, 25);
|
||||
this.cancel.TabIndex = 3;
|
||||
|
|
@ -57,7 +56,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// apply
|
||||
//
|
||||
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.apply.Location = new System.Drawing.Point(572, 411);
|
||||
this.apply.Location = new System.Drawing.Point(581, 411);
|
||||
this.apply.Name = "apply";
|
||||
this.apply.Size = new System.Drawing.Size(98, 25);
|
||||
this.apply.TabIndex = 2;
|
||||
|
|
@ -88,13 +87,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.tvTextureSets.HideSelection = false;
|
||||
this.tvTextureSets.ImageIndex = 0;
|
||||
this.tvTextureSets.ImageList = this.smallimages;
|
||||
this.tvTextureSets.Location = new System.Drawing.Point(0, 0);
|
||||
this.tvTextureSets.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.tvTextureSets.Location = new System.Drawing.Point(0, 3);
|
||||
this.tvTextureSets.Name = "tvTextureSets";
|
||||
this.tvTextureSets.SelectedImageIndex = 0;
|
||||
this.tvTextureSets.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
this.tvTextureSets.SelectionMode = CodeImp.DoomBuilder.GZBuilder.Controls.TreeViewSelectionMode.SingleSelect;
|
||||
this.tvTextureSets.Size = new System.Drawing.Size(199, 390);
|
||||
this.tvTextureSets.Size = new System.Drawing.Size(199, 402);
|
||||
this.tvTextureSets.TabIndex = 4;
|
||||
this.tvTextureSets.TabStop = false;
|
||||
this.tvTextureSets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tvTextureSets_KeyUp);
|
||||
|
|
@ -106,33 +104,42 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.browser.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.browser.HideInputBox = false;
|
||||
this.browser.Location = new System.Drawing.Point(0, 0);
|
||||
this.browser.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.browser.Name = "browser";
|
||||
this.browser.Padding = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.browser.PreventSelection = false;
|
||||
this.browser.Size = new System.Drawing.Size(557, 424);
|
||||
this.browser.Size = new System.Drawing.Size(574, 442);
|
||||
this.browser.TabIndex = 1;
|
||||
this.browser.TabStop = false;
|
||||
this.browser.SelectedItemDoubleClicked += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemDoubleClickDelegate(this.browser_SelectedItemDoubleClicked);
|
||||
this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
|
||||
//
|
||||
// splitContainer
|
||||
// splitter
|
||||
//
|
||||
this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
|
||||
this.splitContainer.Location = new System.Drawing.Point(12, 12);
|
||||
this.splitContainer.Name = "splitContainer";
|
||||
this.splitter.AnimationDelay = 20;
|
||||
this.splitter.AnimationStep = 20;
|
||||
this.splitter.BorderStyle3D = System.Windows.Forms.Border3DStyle.Flat;
|
||||
this.splitter.ControlToHide = this.panel;
|
||||
this.splitter.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.splitter.ExpandParentForm = false;
|
||||
this.splitter.Location = new System.Drawing.Point(574, 0);
|
||||
this.splitter.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.splitter.MinSize = 100;
|
||||
this.splitter.Name = "collapsibleSplitter1";
|
||||
this.splitter.TabIndex = 5;
|
||||
this.splitter.TabStop = false;
|
||||
this.splitter.UseAnimations = false;
|
||||
this.splitter.VisualStyle = CodeImp.DoomBuilder.Controls.VisualStyles.DoubleDots;
|
||||
this.splitter.CollapsedChanged += new System.EventHandler(this.splitter_CollapsedChanged);
|
||||
//
|
||||
// splitContainer.Panel1
|
||||
// panel
|
||||
//
|
||||
this.splitContainer.Panel1.Controls.Add(this.browser);
|
||||
//
|
||||
// splitContainer.Panel2
|
||||
//
|
||||
this.splitContainer.Panel2.Controls.Add(this.tvTextureSets);
|
||||
this.splitContainer.Size = new System.Drawing.Size(760, 424);
|
||||
this.splitContainer.SplitterDistance = 557;
|
||||
this.splitContainer.TabIndex = 5;
|
||||
this.panel.Controls.Add(this.tvTextureSets);
|
||||
this.panel.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.panel.Location = new System.Drawing.Point(582, 0);
|
||||
this.panel.Name = "panel";
|
||||
this.panel.Size = new System.Drawing.Size(202, 442);
|
||||
this.panel.TabIndex = 6;
|
||||
//
|
||||
// TextureBrowserForm
|
||||
//
|
||||
|
|
@ -141,9 +148,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.CancelButton = this.cancel;
|
||||
this.ClientSize = new System.Drawing.Size(784, 442);
|
||||
this.Controls.Add(this.cancel);
|
||||
this.Controls.Add(this.apply);
|
||||
this.Controls.Add(this.splitContainer);
|
||||
this.Controls.Add(this.cancel);
|
||||
this.Controls.Add(this.browser);
|
||||
this.Controls.Add(this.splitter);
|
||||
this.Controls.Add(this.panel);
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "TextureBrowserForm";
|
||||
this.Opacity = 1;
|
||||
|
|
@ -158,9 +167,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextureBrowserForm_FormClosing);
|
||||
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.TextureBrowserForm_HelpRequested);
|
||||
this.ResizeEnd += new System.EventHandler(this.TextureBrowserForm_ResizeEnd);
|
||||
this.splitContainer.Panel1.ResumeLayout(false);
|
||||
this.splitContainer.Panel2.ResumeLayout(false);
|
||||
this.splitContainer.ResumeLayout(false);
|
||||
this.panel.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
|
@ -172,6 +179,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
private System.Windows.Forms.Button apply;
|
||||
private System.Windows.Forms.ImageList smallimages;
|
||||
private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview tvTextureSets;
|
||||
private System.Windows.Forms.SplitContainer splitContainer;
|
||||
private CodeImp.DoomBuilder.Controls.CollapsibleSplitter splitter;
|
||||
private System.Windows.Forms.Panel panel;
|
||||
}
|
||||
}
|
||||
|
|
@ -187,12 +187,6 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
General.Settings.ReadSetting("browserwindow.sizeheight", this.Size.Height));
|
||||
this.WindowState = (FormWindowState)General.Settings.ReadSetting("browserwindow.windowstate", (int)FormWindowState.Normal);
|
||||
|
||||
//mxd. Set SplitterDistance
|
||||
int splitterdistance = splitContainer.Width - General.Settings.ReadSetting("browserwindow.splitterdistance", 203);
|
||||
if(splitterdistance < splitContainer.Panel1MinSize || splitterdistance > splitContainer.Width - splitContainer.Panel2MinSize)
|
||||
splitterdistance = splitContainer.Width - splitContainer.Width / 4;
|
||||
splitContainer.SplitterDistance = splitterdistance;
|
||||
|
||||
//mxd
|
||||
if (this.WindowState == FormWindowState.Normal)
|
||||
{
|
||||
|
|
@ -208,6 +202,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
}
|
||||
|
||||
this.ResumeLayout(true);
|
||||
|
||||
//mxd. Set splitter position and state (doesn't work when layout is suspended)
|
||||
splitter.SplitPosition = Math.Min(General.Settings.ReadSetting("browserwindow.splitterdistance", 203), this.ClientRectangle.Width - 16);
|
||||
if(General.Settings.ReadSetting("browserwindow.splittercollapsed", false)) splitter.IsCollapsed = true;
|
||||
}
|
||||
|
||||
//mxd
|
||||
|
|
@ -421,6 +419,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
lastposition = this.Location;
|
||||
lastsize = this.Size;
|
||||
}
|
||||
|
||||
//mxd. SplitDistance out of bounds?
|
||||
splitter_CollapsedChanged(splitter, EventArgs.Empty);
|
||||
}
|
||||
|
||||
// Moved
|
||||
|
|
@ -452,7 +453,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
General.Settings.WriteSetting("browserwindow.sizewidth", lastsize.Width);
|
||||
General.Settings.WriteSetting("browserwindow.sizeheight", lastsize.Height);
|
||||
General.Settings.WriteSetting("browserwindow.windowstate", windowstate);
|
||||
General.Settings.WriteSetting("browserwindow.splitterdistance", splitContainer.Width - splitContainer.SplitterDistance); //mxd
|
||||
if(!splitter.IsCollapsed) General.Settings.WriteSetting("browserwindow.splitterdistance", splitter.SplitPosition); //mxd
|
||||
General.Settings.WriteSetting("browserwindow.splittercollapsed", splitter.IsCollapsed); //mxd
|
||||
|
||||
//mxd. Save last selected texture set, if it's not "All" (it will be selected anyway if search for initial texture set fails)
|
||||
if(this.DialogResult == DialogResult.OK && tvTextureSets.SelectedNodes.Count > 0 && !(tvTextureSets.SelectedNodes[0].Tag is AllTextureSet))
|
||||
|
|
@ -556,5 +558,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
FillImagesList();
|
||||
}
|
||||
}
|
||||
|
||||
//mxd. SplitDistance out of bounds?
|
||||
private void splitter_CollapsedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(!splitter.IsCollapsed && splitter.SplitPosition > this.ClientRectangle.Width - 16)
|
||||
splitter.SplitPosition = this.ClientRectangle.Width - 16;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
|
||||
EAAAAk1TRnQBSQFMAgEBCAEAARQBAQEUAQEBEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
EAAAAk1TRnQBSQFMAgEBCAEAAYwBAQGMAQEBEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAAUIDAAEBAQABCAUAAYABEBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
|
||||
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
|
||||
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
|
||||
|
|
|
|||
|
|
@ -68,12 +68,12 @@ namespace CodeImp.DoomBuilder.TagExplorer
|
|||
selection = new SelectedNode();
|
||||
|
||||
cbDisplayMode.Items.AddRange(DISPLAY_MODES);
|
||||
cbDisplayMode.SelectedIndex = General.Settings.ReadPluginSetting("displaymode", 0);
|
||||
cbDisplayMode.SelectedIndex = General.Clamp(General.Settings.ReadPluginSetting("displaymode", 0), 0, DISPLAY_MODES.Length - 1);
|
||||
cbDisplayMode.SelectedIndexChanged += cbDisplayMode_SelectedIndexChanged;
|
||||
currentDisplayMode = cbDisplayMode.SelectedItem.ToString();
|
||||
|
||||
cbSortMode.Items.AddRange(SortMode.SORT_MODES);
|
||||
cbSortMode.SelectedIndex = General.Settings.ReadPluginSetting("sortmode", 0);
|
||||
cbSortMode.SelectedIndex = General.Clamp(General.Settings.ReadPluginSetting("sortmode", 0), 0, SortMode.SORT_MODES.Length - 1);
|
||||
cbSortMode.SelectedIndexChanged += cbSortMode_SelectedIndexChanged;
|
||||
currentSortMode = cbSortMode.SelectedItem.ToString();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue