dave/eveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making things actually work and obey settings. The location of the client is always updated when the save command is triggered. Debating if that should be disabled if the setting is disabled. /me shrugs

Browse Source
This commit is contained in:
Regner Blok-Andersen
2014-11-28 12:07:07 +00:00
parent 60890a4476
commit 28da275cbb
4 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
PreviewHandler.cs
View File

@@ -27,7 +27,7 @@ namespace PreviewToy
private Dictionary<String, Dictionary<String, Point>> unique_layouts; private Dictionary<String, Dictionary<String, Point>> unique_layouts;
private Dictionary<String, Point> flat_layout; private Dictionary<String, Point> flat_layout;
private Dictionary<String, RECT> client_layout; private Dictionary<String, ClientLocation> client_layout;
private bool is_initialized; private bool is_initialized;
@@ -36,12 +36,12 @@ namespace PreviewToy
Dictionary<string, string> xml_bad_to_ok_chars; Dictionary<string, string> xml_bad_to_ok_chars;
[DllImport("user32.dll")] [DllImport("user32.dll")]
private static extern int GetWindowRect(IntPtr hwnd, out RECT rect); private static extern int GetWindowRect(IntPtr hwnd, out Rect rect);
[DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint); public static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
private struct RECT private struct Rect
{ {
public int Left; public int Left;
public int Top; public int Top;
@@ -49,6 +49,14 @@ namespace PreviewToy
public int Bottom; public int Bottom;
} }
private struct ClientLocation
{
public int X;
public int Y;
public int Width;
public int Height;
}
public enum zoom_anchor_t public enum zoom_anchor_t
{ {
NW = 0, NW = 0,
@@ -81,7 +89,7 @@ namespace PreviewToy
unique_layouts = new Dictionary<String, Dictionary<String, Point>>(); unique_layouts = new Dictionary<String, Dictionary<String, Point>>();
flat_layout = new Dictionary<String, Point>(); flat_layout = new Dictionary<String, Point>();
client_layout = new Dictionary<String, RECT>(); client_layout = new Dictionary<String, ClientLocation>();
ignoring_size_sync = new Stopwatch(); ignoring_size_sync = new Stopwatch();
ignoring_size_sync.Start(); ignoring_size_sync.Start();
@@ -138,7 +146,7 @@ namespace PreviewToy
option_show_overlay.Checked = Properties.Settings.Default.show_overlay; option_show_overlay.Checked = Properties.Settings.Default.show_overlay;
option_track_client_windows.Checked = Properties.Settings.Default.track_client_positions; option_track_client_windows.Checked = Properties.Settings.Default.track_client_windows;
// disable/enable zoom suboptions // disable/enable zoom suboptions
option_zoom_factor.Enabled = Properties.Settings.Default.zoom_on_hover; option_zoom_factor.Enabled = Properties.Settings.Default.zoom_on_hover;
@@ -182,29 +190,13 @@ namespace PreviewToy
previews_check_listbox.Items.Add(previews[process.MainWindowHandle]); previews_check_listbox.Items.Add(previews[process.MainWindowHandle]);
previews_check_listbox.EndUpdate(); previews_check_listbox.EndUpdate();
if (client_layout.ContainsKey(process.MainWindowTitle)) refresh_client_window_locations(process);
{
int left = Math.Abs(client_layout[process.MainWindowTitle].Left);
int right = Math.Abs(client_layout[process.MainWindowTitle].Right);
int client_width = Math.Abs(left - right);
int top = Math.Abs(client_layout[process.MainWindowTitle].Top);
int bottom = Math.Abs(client_layout[process.MainWindowTitle].Bottom);
int client_height = Math.Abs(top - bottom);
MoveWindow(
process.MainWindowHandle,
client_layout[process.MainWindowTitle].Left,
client_layout[process.MainWindowTitle].Top,
client_width,
client_height,
true);
}
} }
else if (previews.ContainsKey(process.MainWindowHandle)) //or update the preview titles else if (previews.ContainsKey(process.MainWindowHandle) && process.MainWindowTitle != previews[process.MainWindowHandle].Text) //or update the preview titles
{ {
previews[process.MainWindowHandle].SetLabel(process.MainWindowTitle); previews[process.MainWindowHandle].SetLabel(process.MainWindowTitle);
refresh_client_window_locations(process);
} }
if (process.MainWindowHandle == DwmApi.GetForegroundWindow()) if (process.MainWindowHandle == DwmApi.GetForegroundWindow())
@@ -239,6 +231,20 @@ namespace PreviewToy
} }
private void refresh_client_window_locations(Process process)
{
if (Properties.Settings.Default.track_client_windows && client_layout.ContainsKey(process.MainWindowTitle))
{
MoveWindow(
process.MainWindowHandle,
client_layout[process.MainWindowTitle].X,
client_layout[process.MainWindowTitle].Y,
client_layout[process.MainWindowTitle].Width,
client_layout[process.MainWindowTitle].Height,
true);
}
}
private string remove_nonconform_xml_characters(string entry) private string remove_nonconform_xml_characters(string entry)
{ {
@@ -299,13 +305,13 @@ namespace PreviewToy
XElement rootElement = XElement.Load("client_layout.xml"); XElement rootElement = XElement.Load("client_layout.xml");
foreach (var el in rootElement.Elements()) foreach (var el in rootElement.Elements())
{ {
RECT rect = new RECT(); ClientLocation clientLocation = new ClientLocation();
rect.Left = Convert.ToInt32(el.Element("x1").Value); clientLocation.X = Convert.ToInt32(el.Element("x").Value);
rect.Top = Convert.ToInt32(el.Element("y1").Value); clientLocation.Y = Convert.ToInt32(el.Element("y").Value);
rect.Right = Convert.ToInt32(el.Element("x2").Value); clientLocation.Width = Convert.ToInt32(el.Element("width").Value);
rect.Bottom = Convert.ToInt32(el.Element("y2").Value); clientLocation.Height = Convert.ToInt32(el.Element("height").Value);
client_layout[ParseXElement(el)] = rect; client_layout[ParseXElement(el)] = clientLocation;
} }
} }
} }
@@ -360,10 +366,10 @@ namespace PreviewToy
continue; continue;
} }
XElement layout = MakeXElement(clientKV.Key); XElement layout = MakeXElement(clientKV.Key);
layout.Add(new XElement("x1", clientKV.Value.Left)); layout.Add(new XElement("x", clientKV.Value.X));
layout.Add(new XElement("y1", clientKV.Value.Top)); layout.Add(new XElement("y", clientKV.Value.Y));
layout.Add(new XElement("x2", clientKV.Value.Right)); layout.Add(new XElement("width", clientKV.Value.Width));
layout.Add(new XElement("y2", clientKV.Value.Bottom)); layout.Add(new XElement("height", clientKV.Value.Height));
el3.Add(layout); el3.Add(layout);
} }
@@ -402,10 +408,25 @@ namespace PreviewToy
foreach (Process process in processes) foreach (Process process in processes)
{ {
RECT rect = new RECT(); Rect rect = new Rect();
GetWindowRect(process.MainWindowHandle, out rect); GetWindowRect(process.MainWindowHandle, out rect);
client_layout[process.MainWindowTitle] = rect; int left = Math.Abs(rect.Left);
int right = Math.Abs(rect.Right);
int client_width = Math.Abs(left - right);
int top = Math.Abs(rect.Top);
int bottom = Math.Abs(rect.Bottom);
int client_height = Math.Abs(top - bottom);
ClientLocation clientLocation = new ClientLocation();
clientLocation.X = rect.Left;
clientLocation.Y = rect.Top;
clientLocation.Width = client_width;
clientLocation.Height = client_height;
client_layout[process.MainWindowTitle] = clientLocation;
} }
} }
@@ -761,7 +782,9 @@ namespace PreviewToy
private void checkBox1_CheckedChanged(object sender, EventArgs e) private void checkBox1_CheckedChanged(object sender, EventArgs e)
{ {
Properties.Settings.Default.track_client_windows = option_track_client_windows.Checked;
Properties.Settings.Default.Save();
refresh_thumbnails();
} }
} }

8
Properties/Settings.Designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.0 // Runtime Version:4.0.30319.34014
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -194,12 +194,12 @@ namespace PreviewToy.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")] [global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool track_client_positions { public bool track_client_windows {
get { get {
return ((bool)(this["track_client_positions"])); return ((bool)(this["track_client_windows"]));
} }
set { set {
this["track_client_positions"] = value; this["track_client_windows"] = value;
} }
} }
} }

2
Properties/Settings.settings
View File

@@ -44,7 +44,7 @@
<Setting Name="zoom_anchor" Type="System.Byte" Scope="User"> <Setting Name="zoom_anchor" Type="System.Byte" Scope="User">
<Value Profile="(Default)">0</Value> <Value Profile="(Default)">0</Value>
</Setting> </Setting>
<Setting Name="track_client_positions" Type="System.Boolean" Scope="User"> <Setting Name="track_client_windows" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value> <Value Profile="(Default)">False</Value>
</Setting> </Setting>
</Settings> </Settings>

2
app.config
View File

@@ -49,7 +49,7 @@
<setting name="zoom_anchor" serializeAs="String"> <setting name="zoom_anchor" serializeAs="String">
<value>0</value> <value>0</value>
</setting> </setting>
<setting name="track_client_positions" serializeAs="String"> <setting name="track_client_windows" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
</PreviewToy.Properties.Settings> </PreviewToy.Properties.Settings>