Skip to content

Commit 67fdd47

Browse files
HirogenHirogen
committed
fixes tooltip always staying on top
1 parent 13e66b2 commit 67fdd47

5 files changed

Lines changed: 21 additions & 1023 deletions

File tree

‎src/LogExpert.UI/Controls/LogWindow/LogWindow.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@ private void ApplyToolStripMenuItemResources ()
581581

582582
private void ApplyToolTipsResources ()
583583
{
584+
helpToolTip.AutoPopDelay = 5000; //this is in ms, 5000ms = 5 seconds
584585
helpToolTip.SetToolTip(btnColumn, Resources.LogWindow_UI_Button_ToolTip_Column);
585586
helpToolTip.SetToolTip(columnRestrictCheckBox, Resources.LogWindow_UI_CheckBox_ToolTip_ColumnRestrict);
586587
helpToolTip.SetToolTip(knobControlFuzzy, Resources.LogWindow_UI_KnobControl_Fuzzy);
@@ -1333,7 +1334,7 @@ private void OnSelectionChangedTriggerSignal (object sender, EventArgs e)
13331334
if (IsMultiFile)
13341335
{
13351336
//MethodInvoker invoker = DisplayCurrentFileOnStatusline;
1336-
_ = Task.Run(DisplayCurrentFileOnStatusline);
1337+
_ = Task.Run(DisplayCurrentFileOnStatusline);
13371338
//_ = invoker.BeginInvoke(null, null);
13381339
}
13391340
else
@@ -2982,7 +2983,7 @@ private void LogEventWorker ()
29822983
{
29832984
return;
29842985
}
2985-
2986+
29862987
CheckFilterAndHighlight(e);
29872988
_timeSpreadCalc.SetLineCount(e.LineCount);
29882989
}

‎src/LogExpert.UI/Controls/LogWindow/TimeSpreadigControl.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public TimeSpreadingControl ()
3737
Font = new Font("Courier New", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
3838
_toolTip.InitialDelay = 0;
3939
_toolTip.ReshowDelay = 0;
40-
_toolTip.ShowAlways = true;
40+
_toolTip.AutoPopDelay = 5000;
4141
DoubleBuffered = false;
4242

4343
ResumeLayout();

‎src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public LogTabWindow (string[] fileNames, int instanceNumber, bool showInstanceNu
9393
_menuToolbarController = new MenuToolbarController();
9494
_menuToolbarController.InitializeMenus(mainMenuStrip, buttonToolStrip, externalToolsToolStrip, dragControlDateTime, checkBoxFollowTail);
9595
InitializeMenuToolbarControllerEvents();
96-
96+
9797
ApplyTextResources();
9898

9999
ConfigManager = configManager;
@@ -184,29 +184,9 @@ private void InitializeTabControllerEvents ()
184184

185185
#endregion
186186

187-
#region Delegates
188-
189-
private delegate void AddFileTabsDelegate (string[] fileNames);
190-
191-
private delegate void ExceptionFx ();
192-
193-
private delegate void FileNotFoundDelegate (LogWindow.LogWindow logWin);
194-
195-
private delegate void FileRespawnedDelegate (LogWindow.LogWindow logWin);
196-
197-
public delegate void HighlightSettingsChangedEventHandler (object sender, EventArgs e);
198-
199-
private delegate void LoadMultiFilesDelegate (string[] fileName, EncodingOptions encodingOptions);
200-
201-
private delegate void SetColumnizerFx (ILogLineMemoryColumnizer columnizer);
202-
203-
private delegate void SetTabIconDelegate (LogWindow.LogWindow logWindow, Icon icon);
204-
205-
#endregion
206-
207187
#region Events
208188

209-
public event HighlightSettingsChangedEventHandler HighlightSettingsChanged;
189+
public event EventHandler HighlightSettingsChanged;
210190

211191
#endregion
212192

@@ -598,15 +578,15 @@ public LogWindow.LogWindow AddMultiFileTab (string[] fileNames)
598578
multiFileEnabledStripMenuItem.Checked = true;
599579
EncodingOptions encodingOptions = new();
600580
FillDefaultEncodingFromSettings(encodingOptions);
601-
_ = BeginInvoke(new LoadMultiFilesDelegate(logWindow.LoadFilesAsMulti), fileNames, encodingOptions);
581+
_ = BeginInvoke(logWindow.LoadFilesAsMulti, fileNames, encodingOptions);
602582
AddToFileHistory(fileNames[0]);
603583
return logWindow;
604584
}
605585

606586
[SupportedOSPlatform("windows")]
607587
public void LoadFiles (string[] fileNames)
608588
{
609-
_ = Invoke(new AddFileTabsDelegate(AddFileTabs), [fileNames]);
589+
_ = Invoke(AddFileTabs, [fileNames]);
610590
}
611591

612592
[SupportedOSPlatform("windows")]
@@ -703,7 +683,7 @@ private void OnTabControllerWindowActivated (object sender, WindowActivatedEvent
703683

704684
// Update the tab icon to reflect cleared dirty state
705685
var icon = GetLedIcon(data.LedState.DiffSum, data);
706-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), newWindow, icon);
686+
_ = BeginInvoke(SetTabIcon, newWindow, icon);
707687
}
708688

709689
// Notify the window it has been activated
@@ -876,7 +856,7 @@ public void FollowTailChanged (LogWindow.LogWindow logWindow, bool isEnabled, bo
876856
if (Preferences.ShowTailState)
877857
{
878858
var icon = GetLedIcon(data.LedState.DiffSum, data);
879-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWindow, icon);
859+
_ = BeginInvoke(SetTabIcon, logWindow, icon);
880860
}
881861
}
882862

@@ -1487,7 +1467,7 @@ private void StatusLineEventWorker (StatusLineEventArgs e)
14871467
private void FileNotFound (LogWindow.LogWindow logWin)
14881468
{
14891469
var data = logWin.Tag as LogWindowData;
1490-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWin, _deadIcon);
1470+
_ = BeginInvoke(SetTabIcon, logWin, _deadIcon);
14911471
dragControlDateTime.Visible = false;
14921472
}
14931473

@@ -1497,7 +1477,7 @@ private void FileRespawned (LogWindow.LogWindow logWin)
14971477
var data = logWin.Tag as LogWindowData;
14981478
data.LedState.DiffSum = 0;
14991479
var icon = GetLedIcon(0, data);
1500-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWin, icon);
1480+
_ = BeginInvoke(SetTabIcon, logWin, icon);
15011481
}
15021482

15031483
[SupportedOSPlatform("windows")]
@@ -1641,7 +1621,7 @@ private void SetTabIcons (Preferences preferences)
16411621
{
16421622
var data = logWindow.Tag as LogWindowData;
16431623
var icon = GetLedIcon(data.LedState.DiffSum, data);
1644-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWindow, icon);
1624+
_ = BeginInvoke(SetTabIcon, logWindow, icon);
16451625
}
16461626
}
16471627

@@ -2163,8 +2143,7 @@ private void OnSelectFilterToolStripMenuItemClick (object sender, EventArgs e)
21632143
if (logWindow.CurrentColumnizer.GetType() != form.SelectedColumnizer.GetType())
21642144
{
21652145
//logWindow.SetColumnizer(form.SelectedColumnizer);
2166-
SetColumnizerFx fx = logWindow.ForceColumnizer;
2167-
_ = logWindow.Invoke(fx, form.SelectedColumnizer);
2146+
_ = logWindow.Invoke(logWindow.ForceColumnizer, form.SelectedColumnizer);
21682147
SetColumnizerHistoryEntry(logWindow.FileName, form.SelectedColumnizer);
21692148
}
21702149
else
@@ -2180,8 +2159,7 @@ private void OnSelectFilterToolStripMenuItemClick (object sender, EventArgs e)
21802159
{
21812160
if (CurrentLogWindow.CurrentColumnizer.GetType() != form.SelectedColumnizer.GetType())
21822161
{
2183-
SetColumnizerFx fx = CurrentLogWindow.ForceColumnizer;
2184-
_ = CurrentLogWindow.Invoke(fx, form.SelectedColumnizer);
2162+
_ = CurrentLogWindow.Invoke(CurrentLogWindow.ForceColumnizer, form.SelectedColumnizer);
21852163
SetColumnizerHistoryEntry(CurrentLogWindow.FileName, form.SelectedColumnizer);
21862164
}
21872165

@@ -2434,12 +2412,12 @@ private void OnFileSizeChanged (object sender, LogEventArgs e)
24342412

24352413
private void OnLogWindowFileNotFound (object sender, EventArgs e)
24362414
{
2437-
_ = Invoke(new FileNotFoundDelegate(FileNotFound), sender);
2415+
_ = Invoke(FileNotFound, sender);
24382416
}
24392417

24402418
private void OnLogWindowFileRespawned (object sender, EventArgs e)
24412419
{
2442-
_ = Invoke(new FileRespawnedDelegate(FileRespawned), sender);
2420+
_ = Invoke(FileRespawned, sender);
24432421
}
24442422

24452423
private void OnLogWindowFilterListChanged (object sender, FilterListChangedEventArgs e)
@@ -2476,7 +2454,7 @@ private void OnTailFollowed (object sender, EventArgs e)
24762454
var data = ((LogWindow.LogWindow)sender).Tag as LogWindowData;
24772455
data.LedState.IsDirty = false;
24782456
var icon = GetLedIcon(data.LedState.DiffSum, data);
2479-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), (LogWindow.LogWindow)sender, icon);
2457+
_ = BeginInvoke(SetTabIcon, (LogWindow.LogWindow)sender, icon);
24802458
}
24812459
}
24822460
}
@@ -2492,7 +2470,7 @@ private void OnLogWindowSyncModeChanged (object sender, SyncModeEventArgs e)
24922470
: TimeSyncState.NotSynced;
24932471

24942472
var icon = GetLedIcon(data.LedState.DiffSum, data);
2495-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), (LogWindow.LogWindow)sender, icon);
2473+
_ = BeginInvoke(SetTabIcon, (LogWindow.LogWindow)sender, icon);
24962474
}
24972475
}
24982476

@@ -2551,7 +2529,7 @@ private void OnReloadToolStripMenuItemClick (object sender, EventArgs e)
25512529
{
25522530
var data = CurrentLogWindow.Tag as LogWindowData;
25532531
var icon = GetLedIcon(0, data);
2554-
_ = BeginInvoke(new SetTabIconDelegate(SetTabIcon), CurrentLogWindow, icon);
2532+
_ = BeginInvoke(SetTabIcon, CurrentLogWindow, icon);
25552533
CurrentLogWindow.Reload();
25562534
}
25572535
}
@@ -2930,8 +2908,7 @@ private void OnThrowExceptionGUIThreadToolStripMenuItemClick (object sender, Eve
29302908

29312909
private void OnThrowExceptionBackgroundThToolStripMenuItemClick (object sender, EventArgs e)
29322910
{
2933-
ExceptionFx fx = ThrowExceptionFx;
2934-
_ = fx.BeginInvoke(null, null);
2911+
_ = Task.Run(ThrowExceptionFx);
29352912
}
29362913

29372914
private void OnThrowExceptionBackgroundThreadToolStripMenuItemClick (object sender, EventArgs e)

0 commit comments

Comments
 (0)