stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 12:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed keyboard input for things filters when the list is dropped down

Browse source
This commit is contained in:
codeimp 2009-01-16 10:20:19 +00:00
parent 3666e733b2
commit 9c0bd91ce6
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Windows/MainForm.cs
View file

@ -1133,6 +1133,9 @@ namespace CodeImp.DoomBuilder.Windows
if(shift) mod |= (int)Keys.Shift; if(shift) mod |= (int)Keys.Shift;
if(ctrl) mod |= (int)Keys.Control; if(ctrl) mod |= (int)Keys.Control;
// Don't process any keys when they are meant for the things filter drop down box
if(!thingfilters.DroppedDown)
{
// Invoke any actions associated with this key // Invoke any actions associated with this key
General.Actions.UpdateModifiers(mod); General.Actions.UpdateModifiers(mod);
General.Actions.KeyPressed((int)e.KeyData); General.Actions.KeyPressed((int)e.KeyData);
@ -1140,6 +1143,7 @@ namespace CodeImp.DoomBuilder.Windows
// Invoke on editing mode // Invoke on editing mode
if((General.Map != null) && (General.Editing.Mode != null)) General.Editing.Mode.OnKeyDown(e); if((General.Map != null) && (General.Editing.Mode != null)) General.Editing.Mode.OnKeyDown(e);
} }
}
// When a key is released // When a key is released
private void MainForm_KeyUp(object sender, KeyEventArgs e) private void MainForm_KeyUp(object sender, KeyEventArgs e)
@ -1154,6 +1158,9 @@ namespace CodeImp.DoomBuilder.Windows
if(shift) mod |= (int)Keys.Shift; if(shift) mod |= (int)Keys.Shift;
if(ctrl) mod |= (int)Keys.Control; if(ctrl) mod |= (int)Keys.Control;
// Don't process any keys when they are meant for the things filter drop down box
if(!thingfilters.DroppedDown)
{
// Invoke any actions associated with this key // Invoke any actions associated with this key
General.Actions.UpdateModifiers(mod); General.Actions.UpdateModifiers(mod);
General.Actions.KeyReleased((int)e.KeyData); General.Actions.KeyReleased((int)e.KeyData);
@ -1161,6 +1168,7 @@ namespace CodeImp.DoomBuilder.Windows
// Invoke on editing mode // Invoke on editing mode
if((General.Map != null) && (General.Editing.Mode != null)) General.Editing.Mode.OnKeyUp(e); if((General.Map != null) && (General.Editing.Mode != null)) General.Editing.Mode.OnKeyUp(e);
} }
}
#endregion #endregion
@ -1239,7 +1247,7 @@ namespace CodeImp.DoomBuilder.Windows
} }
// Lose focus // Lose focus
LoseFocus(sender, e); if(!thingfilters.DroppedDown) LoseFocus(sender, e);
} }
// This updates the things filter on the toolbar // This updates the things filter on the toolbar