[idd] helper: fix notification icon creation on explorer start

idd/LGIddHelper/CConfigWindow.cpp

@@ -57,11 +57,20 @@ void CConfigWindow::updateFont()
 
   for (HWND child : std::initializer_list<HWND>({
     *m_version, *m_modeGroup, *m_modeBox, *m_widthLabel, *m_heightLabel, *m_refreshLabel,
-    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate,
+    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate, *m_modeDelete,
   }))
     SendMessage(child, WM_SETFONT, (WPARAM)m_font.Get(), 1);
 }
 
+void CConfigWindow::updateModeList()
+{
+  m_modeBox->addItem(L"<add new>", -1);
+
+  auto &modes = *m_modes;
+  for (size_t i = 0; i < modes.size(); ++i)
+    m_modeBox->addItem(modes[i].toString(), i);
+}
+
 LRESULT CConfigWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   switch (uMsg)
@@ -93,15 +102,9 @@ LRESULT CConfigWindow::onCreate()
 
   m_modeGroup.reset(new CGroupBox(L"Custom modes", WS_CHILD | WS_VISIBLE, m_hwnd));
 
-  m_modeBox.reset(new CListBox(WS_CHILD | WS_VISIBLE | LBS_NOTIFY, m_hwnd));
+  m_modeBox.reset(new CListBox(WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_NOTIFY, m_hwnd));
   if (m_modes)
-  {
-    m_modeBox->addItem(L"<add new>", -1);
-
-    auto &modes = *m_modes;
-    for (size_t i = 0; i < modes.size(); ++i)
-      m_modeBox->addItem(modes[i].toString(), i);
-  }
+    updateModeList();
 
   m_widthLabel.reset(new CStaticWidget(L"Width:", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
   m_heightLabel.reset(new CStaticWidget(L"Height:", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
@@ -112,7 +115,9 @@ LRESULT CConfigWindow::onCreate()
   m_modeRefresh.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | ES_LEFT, m_hwnd));
 
   m_modeUpdate.reset(new CButton(L"Save", WS_CHILD | WS_VISIBLE, m_hwnd));
+  m_modeDelete.reset(new CButton(L"Delete", WS_CHILD | WS_VISIBLE, m_hwnd));
   EnableWindow(*m_modeUpdate, FALSE);
+  EnableWindow(*m_modeDelete, FALSE);
 
   updateFont();
 
@@ -139,36 +144,38 @@ LRESULT CConfigWindow::onResize(DWORD width, DWORD height)
   pos.pinBottomLeft(*m_modeHeight, 75, 72, 50, 20);
   pos.pinBottomLeft(*m_modeRefresh, 75, 48, 50, 20);
   pos.pinBottomLeft(*m_modeUpdate, 24, 20, 50, 24);
+  pos.pinBottomLeft(*m_modeDelete, 75, 20, 50, 24);
   return 0;
 }
 
+void CConfigWindow::onModeListSelectChange()
+{
+  int sel = m_modeBox->getSel();
+  if (sel == LB_ERR)
+  {
+    EnableWindow(*m_modeUpdate, FALSE);
+    EnableWindow(*m_modeDelete, FALSE);
+    return;
+  }
+
+  int index = m_modeBox->getData(sel);
+
+  if (index >= 0)
+  {
+    auto &mode = (*m_modes)[index];
+    m_modeWidth->setNumericValue(mode.width);
+    m_modeHeight->setNumericValue(mode.height);
+    m_modeRefresh->setNumericValue(mode.refresh);
+  }
+  EnableWindow(*m_modeUpdate, TRUE);
+  EnableWindow(*m_modeDelete, index >= 0);
+}
+
 LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
 {
   if (hwnd == *m_modeBox && code == LBN_SELCHANGE && m_modes)
   {
-    int sel = m_modeBox->getSel();
-    if (sel == LB_ERR)
-    {
-      EnableWindow(*m_modeUpdate, FALSE);
-      return 0;
-    }
-
-    int index = m_modeBox->getData(sel);
-
-    if (index >= 0)
-    {
-      auto &mode = (*m_modes)[index];
-      m_modeWidth->setNumericValue(mode.width);
-      m_modeHeight->setNumericValue(mode.height);
-      m_modeRefresh->setNumericValue(mode.refresh);
-    }
-    else
-    {
-      m_modeWidth->setValue(L"");
-      m_modeHeight->setValue(L"");
-      m_modeRefresh->setValue(L"");
-    }
-    EnableWindow(*m_modeUpdate, TRUE);
+    onModeListSelectChange();
   }
   else if (hwnd == *m_modeUpdate && code == BN_CLICKED && m_modes)
   {
@@ -178,9 +185,17 @@ LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
 
     int index = m_modeBox->getData(sel);
     auto &mode = index >= 0 ? (*m_modes)[index] : m_modes->emplace_back();
-    mode.width = m_modeWidth->getNumericValue();
-    mode.height = m_modeHeight->getNumericValue();
-    mode.refresh = m_modeRefresh->getNumericValue();
+
+    try
+    {
+      mode.width = m_modeWidth->getNumericValue();
+      mode.height = m_modeHeight->getNumericValue();
+      mode.refresh = m_modeRefresh->getNumericValue();
+    }
+    catch (std::logic_error&)
+    {
+      return 0;
+    }
 
     if (index >= 0)
       m_modeBox->delItem(sel);
@@ -191,5 +206,22 @@ LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
     if (result != ERROR_SUCCESS)
       DEBUG_ERROR_HR(result, "Failed to save modes");
   }
+  else if (hwnd == *m_modeDelete && code == BN_CLICKED && m_modes)
+  {
+    int sel = m_modeBox->getSel();
+    if (sel == LB_ERR)
+      return 0;
+
+    int index = m_modeBox->getData(sel);
+    m_modeBox->clear();
+    m_modes->erase(m_modes->begin() + index);
+
+    LRESULT result = m_settings.setModes(*m_modes);
+    if (result != ERROR_SUCCESS)
+      DEBUG_ERROR_HR(result, "Failed to save modes");
+
+    updateModeList();
+    onModeListSelectChange();
+  }
   return 0;
 }

idd/LGIddHelper/CConfigWindow.h

@@ -30,6 +30,7 @@ class CConfigWindow : public CWindow
   std::unique_ptr<CEditWidget> m_modeRefresh;
 
   std::unique_ptr<CButton> m_modeUpdate;
+  std::unique_ptr<CButton> m_modeDelete;
 
   std::function<void()> m_onDestroy;
   double m_scale;
@@ -38,6 +39,8 @@ class CConfigWindow : public CWindow
   std::optional<std::vector<DisplayMode>> m_modes;
 
   void updateFont();
+  void updateModeList();
+  void onModeListSelectChange();
 
   virtual LRESULT handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
   virtual LRESULT onCreate() override;

idd/LGIddHelper/CListBox.cpp

@@ -50,3 +50,8 @@ void CListBox::setSel(int index)
   if (!ListBox_SetCurSel(m_hwnd, index))
     DEBUG_ERROR("listbox: failed to set selection to %d", index);
 }
+
+void CListBox::clear()
+{
+  ListBox_ResetContent(m_hwnd);
+}

idd/LGIddHelper/CListBox.h

@@ -12,4 +12,5 @@ public:
   int getSel();
   int getData(int index);
   void setSel(int index);
+  void clear();
 };

idd/LGIddHelper/CNotifyWindow.cpp

@@ -51,6 +51,7 @@ LRESULT CNotifyWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
   {
   case WM_NOTIFY_ICON:
     return onNotifyIcon(LOWORD(lParam), HIWORD(lParam), GET_X_LPARAM(wParam), GET_Y_LPARAM(wParam));
+
   case WM_CLEAN_UP_CONFIG:
     if (m_config && !m_config->hwnd())
     {
@@ -58,6 +59,7 @@ LRESULT CNotifyWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
       m_config.reset();
     }
     return 0;
+
   default:
     if (s_taskbarCreated && uMsg == s_taskbarCreated)
     {
@@ -70,6 +72,9 @@ LRESULT CNotifyWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 LRESULT CNotifyWindow::onCreate()
 {
+  // Allow explorer to send us this message to register the notification icon.
+  ChangeWindowMessageFilterEx(m_hwnd, s_taskbarCreated, MSGFLT_ALLOW, NULL);
+
   registerIcon();
   return 0;
 }
@@ -129,7 +134,10 @@ void CNotifyWindow::registerIcon()
   StringCbCopy(m_iconData.szTip, sizeof m_iconData.szTip, L"Looking Glass (IDD)");
 
   if (!Shell_NotifyIcon(NIM_ADD, &m_iconData))
+  {
     DEBUG_ERROR_HR(GetLastError(), "Shell_NotifyIcon(NIM_ADD)");
+    return;
+  }
 
   if (!Shell_NotifyIcon(NIM_SETVERSION, &m_iconData))
     DEBUG_ERROR_HR(GetLastError(), "Shell_NotifyIcon(NIM_SETVERSION)");