[idd] helper: allow scrolling when mode list is long

idd/LGIddHelper/CConfigWindow.cpp

@@ -57,21 +57,11 @@ 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_modeDelete,
-    *m_autosizeGroup, *m_defRefreshLabel, *m_defRefresh, *m_defRefreshHz,
+    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate,
   }))
     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)
@@ -103,31 +93,26 @@ 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 | WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY, m_hwnd));
+  m_modeBox.reset(new CListBox(WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_NOTIFY, m_hwnd));
   if (m_modes)
-    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);
+  }
 
   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));
   m_refreshLabel.reset(new CStaticWidget(L"Refresh:", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
 
-  m_modeWidth.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_LEFT | ES_NUMBER, m_hwnd));
-  m_modeHeight.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_LEFT | ES_NUMBER, m_hwnd));
-  m_modeRefresh.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_LEFT | ES_NUMBER, m_hwnd));
+  m_modeWidth.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | ES_LEFT, m_hwnd));
+  m_modeHeight.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | ES_LEFT, m_hwnd));
+  m_modeRefresh.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | ES_LEFT, m_hwnd));
 
-  m_modeUpdate.reset(new CButton(L"Save", WS_CHILD | WS_VISIBLE | WS_TABSTOP, m_hwnd));
-  m_modeDelete.reset(new CButton(L"Delete", WS_CHILD | WS_VISIBLE | WS_TABSTOP, m_hwnd));
+  m_modeUpdate.reset(new CButton(L"Save", WS_CHILD | WS_VISIBLE, m_hwnd));
   EnableWindow(*m_modeUpdate, FALSE);
-  EnableWindow(*m_modeDelete, FALSE);
-
-  m_autosizeGroup.reset(new CGroupBox(L"Autosizing", WS_CHILD | WS_VISIBLE, m_hwnd));
-  m_defRefreshLabel.reset(new CStaticWidget(L"Default refresh:", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
-  m_defRefresh.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | ES_LEFT | ES_NUMBER | WS_TABSTOP, m_hwnd));
-  m_defRefreshHz.reset(new CStaticWidget(L"Hz", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
-
-  RECT client = { 0, 0, (LONG)(436 * m_scale), (LONG)(300 * m_scale) };
-  AdjustWindowRect(&client, WS_OVERLAPPEDWINDOW, FALSE);
-  SetWindowPos(m_hwnd, NULL, 0, 0, client.right - client.left, client.bottom - client.top, SWP_NOMOVE | SWP_NOZORDER);
 
   updateFont();
 
@@ -145,7 +130,6 @@ LRESULT CConfigWindow::onResize(DWORD width, DWORD height)
 {
   WidgetPositioner pos(m_scale, width, height);
   pos.pinTopLeftRight(*m_version, 12, 12, 12, 20);
-
   pos.pinLeftTopBottom(*m_modeGroup, 12, 40, 200, 12);
   pos.pinLeftTopBottom(*m_modeBox, 24, 64, 176, 120);
   pos.pinBottomLeft(*m_widthLabel, 24, 96, 50, 20);
@@ -155,43 +139,36 @@ 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);
-
-  pos.pinTopLeft(*m_autosizeGroup, 224, 40, 200, 52);
-  pos.pinTopLeft(*m_defRefreshLabel, 236, 64, 95, 20);
-  pos.pinTopLeft(*m_defRefresh, 331, 64, 63, 20);
-  pos.pinTopLeft(*m_defRefreshHz, 398, 64, 16, 20);
   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)
   {
-    onModeListSelectChange();
+    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);
   }
   else if (hwnd == *m_modeUpdate && code == BN_CLICKED && m_modes)
   {
@@ -201,17 +178,9 @@ 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();
-
-    try
-    {
-      mode.width = m_modeWidth->getNumericValue();
-      mode.height = m_modeHeight->getNumericValue();
-      mode.refresh = m_modeRefresh->getNumericValue();
-    }
-    catch (std::logic_error&)
-    {
-      return 0;
-    }
+    mode.width = m_modeWidth->getNumericValue();
+    mode.height = m_modeHeight->getNumericValue();
+    mode.refresh = m_modeRefresh->getNumericValue();
 
     if (index >= 0)
       m_modeBox->delItem(sel);
@@ -222,22 +191,5 @@ 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,12 +30,6 @@ class CConfigWindow : public CWindow
   std::unique_ptr<CEditWidget> m_modeRefresh;
 
   std::unique_ptr<CButton> m_modeUpdate;
-  std::unique_ptr<CButton> m_modeDelete;
-
-  std::unique_ptr<CGroupBox> m_autosizeGroup;
-  std::unique_ptr<CStaticWidget> m_defRefreshLabel;
-  std::unique_ptr<CEditWidget> m_defRefresh;
-  std::unique_ptr<CStaticWidget> m_defRefreshHz;
 
   std::function<void()> m_onDestroy;
   double m_scale;
@@ -44,8 +38,6 @@ 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,8 +50,3 @@ 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,5 +12,4 @@ public:
   int getSel();
   int getData(int index);
   void setSel(int index);
-  void clear();
 };

idd/LGIddHelper/CNotifyWindow.cpp

@@ -51,7 +51,6 @@ 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())
     {
@@ -59,7 +58,6 @@ LRESULT CNotifyWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
       m_config.reset();
     }
     return 0;
-
   default:
     if (s_taskbarCreated && uMsg == s_taskbarCreated)
     {
@@ -72,9 +70,6 @@ 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;
 }
@@ -134,20 +129,12 @@ 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)");
 }
 
-HWND CNotifyWindow::hwndDialog()
-{
-  return m_config ? m_config->hwnd() : nullptr;
-}
-
 void CNotifyWindow::close()
 {
   closeRequested = true;

idd/LGIddHelper/CNotifyWindow.h

@@ -28,6 +28,5 @@ public:
   ~CNotifyWindow() override;
   static bool registerClass();
 
-  HWND hwndDialog();
   void close();
 };

idd/LGIddHelper/main.cpp

@@ -105,12 +105,8 @@ int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _
   MSG msg;
   while (GetMessage(&msg, NULL, 0, 0) > 0)
   {
-    HWND hDlg = window.hwndDialog();
-    if (!hDlg || !IsDialogMessage(hDlg, &msg))
-    {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
+    TranslateMessage(&msg);
+    DispatchMessage(&msg);
   }
 
   (void) UnregisterWait(hWait);