Icons

[autorec] / src / win.h

diff --git a/src/win.h b/src/win.h
index 1e761b6e72893a9948da3431480938cce4633818..b8763ea54ffc09ad85fae46fae61c2fe753205c1 100644 (file)
--- a/src/win.h
+++ b/src/win.h
@@ -46,7 +46,6 @@ namespace win
   struct Window : Hwnd\r
   {\r
   private:\r
   struct Window : Hwnd\r
   {\r
   private:\r

-    NOTIFYICONDATAA niData = { 0 };\r

 \r
     static LRESULT CALLBACK\r
     WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)\r
 \r
     static LRESULT CALLBACK\r
     WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)\r


@@ -62,17 +61,11 @@ namespace win
           DestroyWindow(hwnd);\r
           break;\r
         case WM_DESTROY:\r
           DestroyWindow(hwnd);\r
           break;\r
         case WM_DESTROY:\r

-          Shell_NotifyIconA(NIM_DELETE, &window->niData);\r

           lay_destroy_context(&window->ctx);\r
           PostQuitMessage(0);\r
           break;\r
         case WM_SIZE:\r
           lay_destroy_context(&window->ctx);\r
           PostQuitMessage(0);\r
           break;\r
         case WM_SIZE:\r

-          if (wParam == SIZE_MINIMIZED) {\r
-            //TODO: auslagen\r
-            //ShowNotificationIcon();\r
-            ShowWindow(hwnd, false);\r
-          }\r
-          else {\r
+          if (wParam != SIZE_MINIMIZED) {\r

             lay_set_size_xy(&window->ctx, window->lId, LOWORD(lParam), HIWORD(lParam));\r
             lay_run_context(&window->ctx);\r
 \r
             lay_set_size_xy(&window->ctx, window->lId, LOWORD(lParam), HIWORD(lParam));\r
             lay_run_context(&window->ctx);\r
 \r


@@ -81,23 +74,8 @@ namespace win
           break;\r
         case WM_NOTIFY:\r
           break;\r
           break;\r
         case WM_NOTIFY:\r
           break;\r

-        case WM_APP + 1:\r
-          if (LOWORD(lParam) == NIN_SELECT) {\r
-            //TODO: auslagern\r
-            //HideNotificationIcon();\r
-            ShowWindow(hwnd, true);\r
-            SetForegroundWindow(hwnd);\r
-            SetActiveWindow(hwnd);\r
-          }\r
-          break;\r

         case WM_CTLCOLORSTATIC:\r
         case WM_CTLCOLORSTATIC:\r

-          return (LONG)GetStockObject(WHITE_BRUSH);\r
-        case WM_GETMINMAXINFO: {\r
-          MINMAXINFO *mmInfo = (MINMAXINFO*)lParam;\r
-          mmInfo->ptMinTrackSize.x = 400;\r
-          mmInfo->ptMinTrackSize.y = 200;\r
-          break;\r
-        }\r
+          return (LONG_PTR)GetStockObject(WHITE_BRUSH);\r

         default:\r
           defaultHandler = true;\r
           break;\r
         default:\r
           defaultHandler = true;\r
           break;\r


@@ -126,12 +104,12 @@ namespace win
       wc.cbClsExtra = 0;\r
       wc.cbWndExtra = sizeof(Window*);\r
       wc.hInstance = hInstance;\r
       wc.cbClsExtra = 0;\r
       wc.cbWndExtra = sizeof(Window*);\r
       wc.hInstance = hInstance;\r

-      wc.hIcon = LoadIcon(nullptr, IDI_APPLICATION);\r
-      wc.hCursor = LoadCursor(nullptr, IDC_ARROW);\r
+      wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON_WHITE));\r
+      wc.hCursor = LoadCursor(hInstance, IDC_ARROW);\r

       wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);\r
       wc.lpszMenuName = nullptr;\r
       wc.lpszClassName = className.c_str();\r
       wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);\r
       wc.lpszMenuName = nullptr;\r
       wc.lpszClassName = className.c_str();\r

-      wc.hIconSm = LoadIcon(nullptr, IDI_APPLICATION);\r
+      wc.hIconSm = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON_WHITE));\r

       RegisterClassExA(&wc);\r
 \r
       lay_init_context(&ctx);\r
       RegisterClassExA(&wc);\r
 \r
       lay_init_context(&ctx);\r


@@ -151,15 +129,6 @@ namespace win
                           nullptr);\r
 \r
       SetWindowLongPtrA(hwnd, 0, (LONG_PTR)this);\r
                           nullptr);\r
 \r
       SetWindowLongPtrA(hwnd, 0, (LONG_PTR)this);\r

-      \r
-                          \r
-      niData.cbSize = sizeof(niData);\r
-      niData.uID = 12345;\r
-      niData.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;\r
-      niData.hIcon = LoadIconA(hInstance, MAKEINTRESOURCEA(IDI_MY_ICON));\r
-      niData.hWnd = hwnd;\r
-      niData.uCallbackMessage = WM_APP+1;\r
-      niData.uVersion = NOTIFYICON_VERSION_4;\r

     }\r
     bool update()\r
     {\r
     }\r
     bool update()\r
     {\r


@@ -174,7 +143,9 @@ namespace win
     void show()\r
     {\r
       ShowWindow(hwnd, true);\r
     void show()\r
     {\r
       ShowWindow(hwnd, true);\r

-\r
+    }\r
+    void setDefaultFont()\r
+    {\r

       EnumChildWindows(\r
         hwnd,\r
         [](HWND hwnd, LPARAM lParam) -> BOOL {\r
       EnumChildWindows(\r
         hwnd,\r
         [](HWND hwnd, LPARAM lParam) -> BOOL {\r