Fix WorkerW desktop slideshow problem.

BazzaCuda · Aug 31, 2023 · 2b47d11 · 2b47d11
1 parent d14c63d
commit 2b47d11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CustomMenu.dpr b/CustomMenu.dpr
@@ -44,7 +44,7 @@ uses
 {$R *.res}
 
 begin
-  ReportMemoryLeaksOnShutdown := TRUE;
+//  ReportMemoryLeaksOnShutdown := TRUE;
 
   case hasParamSingle and alreadyRunning of TRUE: begin
                                                     case hasParamShowMenu of TRUE: findCustomMenu; end;

diff --git a/FormConfig.dfm b/FormConfig.dfm
@@ -2572,11 +2572,11 @@ object ConfigForm: TConfigForm
         ParentFont = False
       end
       object lblSelectFromExeDLLetc: TLabel
-        Left = 187
+        Left = 140
         Top = 209
-        Width = 173
+        Width = 219
         Height = 17
-        Caption = 'Select icon from a DLL or EXE'
+        Caption = 'Select icon from a DLL / EXE / ICL etc.'
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWhite
         Font.Height = -13

diff --git a/FormCustomMenu.pas b/FormCustomMenu.pas
@@ -677,7 +677,7 @@ function TCustomMenu.setMouseTrap: boolean;
 
       mouseWnd      := WindowFromPoint(LLMouseHook.HookStruct.Pt);                                      // get the window this mouse message is for
 //      debugInteger('mouseWnd', mouseWnd);
-      isDesktop     := mouseWnd = hDesktop;                                                             // is it the desktop?
+      isDesktop     := (mouseWnd = hDesktop) or (mouseWnd = hDefView);                                  // is it the desktop?
       isMenuWnd     := menuWnd(MouseWnd);                                                               // is it one of our menus?
 
       // ignore mouse wheel and middle button clicks for now. We're only interested in left and right button clicks and releases.
@@ -705,7 +705,7 @@ function TCustomMenu.setMouseTrap: boolean;
     hDefView := FindWindowEx(hProgman, 0, 'SHELLDLL_DefView', '');
     case hDefView = 0 of TRUE: enumWindows(@findDefView, 0); end;
     case hDefView = 0 of TRUE: enumWindows(@findWorkerW, 0); end;
-    case hDefView = 0 of TRUE: debug('Can''t find the DefView window'); end;
+    case hDefView = 0 of TRUE: raise exception.create('Can''t find the DefView window - please raise an issue on Github'); end;
     hDesktop := FindWindowEx(hDefView, 0, 'SysListView32', 'FolderView');
 
 //    debugInteger('hProgman', hProgman);

diff --git a/FormIconExplorer.dfm b/FormIconExplorer.dfm
@@ -2105,6 +2105,7 @@ object IconExplorerForm: TIconExplorerForm
           Items.Strings = (
             'DLLs, EXEs, CPLs (*.dll,*.exe,*.cpl)'
             'DRVs, OCXs (*.drv,*.ocx)'
+            'Icon Libraries (*.icl)'
             'All Files (*.*)')
         end
       end