Skip to content

Commit 3647431

Browse files
AlexanderProAlexanderPro
committed
Replaced two buttons with one.
1 parent 7458357 commit 3647431

File tree

10 files changed

+46
-125
lines changed

10 files changed

+46
-125
lines changed

‎WindowTextExtractor/Forms/MainForm.Designer.cs‎

Lines changed: 12 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WindowTextExtractor/Forms/MainForm.cs‎

Lines changed: 27 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ public partial class MainForm : Form, IMessageFilter
1313
{
1414
private readonly int _processId;
1515
private readonly int _messageId;
16-
private bool _isButtonTargetTextMouseDown;
17-
private bool _isButtonTargetPasswordMouseDown;
16+
private bool _isButtonTargetMouseDown;
1817
private string _64BitFilePath;
1918

2019
public MainForm()
2120
{
2221
InitializeComponent();
23-
_isButtonTargetTextMouseDown = false;
24-
_isButtonTargetPasswordMouseDown = false;
22+
_isButtonTargetMouseDown = false;
2523
_processId = Process.GetCurrentProcess().Id;
2624
_messageId = NativeMethods.RegisterWindowMessage("WINDOW_TEXT_EXTRACTOR_HOOK");
2725
_64BitFilePath = "";
@@ -76,23 +74,11 @@ protected override void OnClosed(EventArgs e)
7674
#endif
7775
}
7876

79-
private void btnTargetText_MouseDown(object sender, MouseEventArgs e)
77+
private void btnTarget_MouseDown(object sender, MouseEventArgs e)
8078
{
81-
if (!_isButtonTargetTextMouseDown)
79+
if (!_isButtonTargetMouseDown)
8280
{
83-
_isButtonTargetTextMouseDown = true;
84-
if (!TopMost)
85-
{
86-
SendToBack();
87-
}
88-
}
89-
}
90-
91-
private void btnTargetPassword_MouseDown(object sender, MouseEventArgs e)
92-
{
93-
if (!_isButtonTargetPasswordMouseDown)
94-
{
95-
_isButtonTargetPasswordMouseDown = true;
81+
_isButtonTargetMouseDown = true;
9682
if (!TopMost)
9783
{
9884
SendToBack();
@@ -159,42 +145,34 @@ protected override void WndProc(ref Message m)
159145

160146
public bool PreFilterMessage(ref Message m)
161147
{
162-
if (_isButtonTargetTextMouseDown || _isButtonTargetPasswordMouseDown)
148+
switch (m.Msg)
163149
{
164-
switch (m.Msg)
165-
{
166-
case NativeConstants.WM_LBUTTONUP:
150+
case NativeConstants.WM_LBUTTONUP:
151+
{
152+
if (_isButtonTargetMouseDown)
167153
{
168-
_isButtonTargetTextMouseDown = false;
169-
_isButtonTargetPasswordMouseDown = false;
154+
_isButtonTargetMouseDown = false;
170155
NativeMethods.SetCursor(Cursors.Default.Handle);
171156
if (!TopMost)
172157
{
173158
BringToFront();
174159
}
175-
} break;
160+
}
161+
}
162+
break;
176163

177-
case NativeConstants.WM_MOUSEMOVE:
164+
case NativeConstants.WM_MOUSEMOVE:
165+
{
166+
try
178167
{
179-
try
168+
if (_isButtonTargetMouseDown)
180169
{
181-
if (_isButtonTargetTextMouseDown)
182-
{
183-
NativeMethods.SetCursor(Properties.Resources.TargetText.Handle);
184-
}
185-
else if (_isButtonTargetPasswordMouseDown)
186-
{
187-
NativeMethods.SetCursor(Properties.Resources.TargetPassword.Handle);
188-
}
189-
else
190-
{
191-
NativeMethods.SetCursor(Cursors.Default.Handle);
192-
}
170+
NativeMethods.SetCursor(Properties.Resources.Target.Handle);
193171
var cursorPosition = System.Windows.Forms.Cursor.Position;
194172
var element = AutomationElement.FromPoint(new System.Windows.Point(cursorPosition.X, cursorPosition.Y));
195173
if (element != null && element.Current.ProcessId != _processId)
196174
{
197-
if (element.Current.IsPassword && _isButtonTargetPasswordMouseDown)
175+
if (element.Current.IsPassword)
198176
{
199177
var elementHandle = new IntPtr(element.Current.NativeWindowHandle);
200178
int processId;
@@ -214,9 +192,8 @@ public bool PreFilterMessage(ref Message m)
214192
NativeMethods.QueryPasswordEdit();
215193
NativeMethods.UnsetHook(Handle, elementHandle);
216194
}
217-
}
218-
219-
if (!element.Current.IsPassword && _isButtonTargetTextMouseDown)
195+
}
196+
else
220197
{
221198
var text = element.GetTextFromConsole() ?? element.GetTextFromWindow();
222199
txtContent.Text = text == null ? "" : text.TrimEnd().TrimEnd(Environment.NewLine);
@@ -225,11 +202,12 @@ public bool PreFilterMessage(ref Message m)
225202
}
226203
}
227204
}
228-
catch
229-
{
230-
}
231-
} break;
232-
}
205+
}
206+
catch
207+
{
208+
}
209+
}
210+
break;
233211
}
234212

235213
return false;

‎WindowTextExtractor/Forms/MainForm.resx‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<value>231, 17</value>
125125
</metadata>
126126
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
127-
<data name="btnTargetText.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
127+
<data name="btnTarget.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
128128
<value>
129129
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
130130
YQUAAAPxSURBVGhD7dm9rk1REAfw6zuEEhVajVKCSqHgCVDjKfQiqCR4ATUV8QAoqDVENAqiQKFAfMzv
@@ -145,35 +145,6 @@
145145
cFfm0yL40JqDsLSj+ribMBuj/bxewqHK7CRHS4VuyzrXtw2Arj76ssEWm3Mf2FkhrcnN8rdtJQD1iqJL
146146
EMrflf2JqYTb0RWftVMf6qNv7xt2EZAOVYrK3VH9zNqGvllo5TD6AQh61APIchrbyuk5sLb2FzTcBEbA
147147
sEjtAAAAAElFTkSuQmCC
148-
</value>
149-
</data>
150-
<data name="btnTargetPassword.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
151-
<value>
152-
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
177148
</value>
178149
</data>
179150
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

‎WindowTextExtractor/Properties/Resources.Designer.cs‎

Lines changed: 2 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WindowTextExtractor/Properties/Resources.resx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,8 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121-
<data name="TargetPassword" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\TargetPassword.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123-
</data>
124-
<data name="TargetText" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\TargetText.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
121+
<data name="Target" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Target.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126123
</data>
127124
<data name="WindowTextExtractor" type="System.Resources.ResXFileRef, System.Windows.Forms">
128125
<value>..\WindowTextExtractor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

WindowTextExtractor/TargetText.ico renamed to WindowTextExtractor/Target.ico

File renamed without changes.

WindowTextExtractor/TargetText_x48.png renamed to WindowTextExtractor/Target.png

File renamed without changes.

‎WindowTextExtractor/TargetPassword.ico‎

-167 KB
Binary file not shown.

‎WindowTextExtractor/TargetPassword_x48.png‎

-1.89 KB
Binary file not shown.

‎WindowTextExtractor/WindowTextExtractor.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,10 @@
135135
</Compile>
136136
</ItemGroup>
137137
<ItemGroup>
138-
<None Include="TargetText.ico" />
138+
<None Include="Target.ico" />
139139
</ItemGroup>
140140
<ItemGroup>
141-
<Content Include="TargetPassword.ico" />
142-
<Content Include="TargetPassword_x48.png" />
143-
<Content Include="TargetText_x48.png" />
141+
<Content Include="Target.png" />
144142
<Content Include="WindowTextExtractor.ico" />
145143
<Content Include="WindowTextExtractor.png" />
146144
<EmbeddedResource Include="WindowTextExtractor64.exe" />

0 commit comments

Comments
 (0)