Add text edit control for display text

Author: fdwr

FontSetViewer.cpp

@@ -942,6 +942,7 @@ HRESULT MainWindow::Initialize()
         AppendLog(AppendLogModeImmediate, L"Windows version is older than Windows 10. Application will have very limited functionality.\r\n");
     }
 
+    InitializeDisplayTextEdit();
     InitializeLanguageMenu();
     InitializeFontCollectionFilterUI();
     InitializeFontCollectionListUI();
@@ -1172,6 +1173,13 @@ DialogProcResult CALLBACK MainWindow::OnCommand(HWND hwnd, WPARAM wParam, LPARAM
         UpdateFontCollectionListUI();
         break;
 
+    case IdcText:
+        if (wmEvent == EN_CHANGE)
+        {
+            InvalidateRect(GetDlgItem(hwnd_, IdcFontCollectionList), nullptr, true);
+        }
+        break;
+
     case IdcActivateFontCollectionFilter:
         {
             // Get the focused item to see which filter is being activated.
@@ -1522,14 +1530,20 @@ HRESULT MainWindow::DrawFontCollectionIconPreview(const NMLVCUSTOMDRAW* customDr
         return S_FALSE;
 
     // Get the item text and icon index.
+    // Check if the text control has any text in it, else just use the listview item text.
     wchar_t textBuffer[256]; textBuffer[0] = '\0';
-    LVITEM listViewItem;
-    ZeroMemory(OUT &listViewItem, sizeof(listViewItem));
-    listViewItem.mask  = LVIF_TEXT | LVIF_IMAGE;
-    listViewItem.pszText = textBuffer;
-    listViewItem.cchTextMax = ARRAYSIZE(textBuffer);
-    listViewItem.iItem = itemIndex;
-    ListView_GetItem(customDraw->nmcd.hdr.hwndFrom, OUT &listViewItem);
+    HWND hwndText = GetDlgItem(hwnd_, IdcText);
+    Edit_GetText(hwndText, textBuffer, std::size(textBuffer));
+
+    LVITEM listViewItem = {};
+    if (textBuffer[0] == '\0')
+    {
+        listViewItem.mask  = LVIF_TEXT | LVIF_IMAGE;
+        listViewItem.pszText = textBuffer;
+        listViewItem.cchTextMax = ARRAYSIZE(textBuffer);
+        listViewItem.iItem = itemIndex;
+        ListView_GetItem(customDraw->nmcd.hdr.hwndFrom, OUT &listViewItem);
+    }
 
     // Transfer bitmap into temporary bitmap.
     BitBlt(renderTarget_->GetMemoryDC(), 0,0, rect.right - rect.left, rect.bottom - rect.top, customDraw->nmcd.hdc, rect.left, rect.top, SRCCOPY|NOMIRRORBITMAP);
@@ -1763,13 +1777,13 @@ void MainWindow::OnSize()
     RECT paddedClientRect = clientRect;
     InflateRect(IN OUT &paddedClientRect, -spacing, -spacing);
 
-    const size_t filterIndex = 0;
-    const size_t logIndex = 2;
+    const size_t filterIndex = 1;
+    const size_t logIndex = 3;
     const long mainWindowThirdWidth = paddedClientRect.right / 3;
     const long mainWindowQuarterHeight = paddedClientRect.bottom / 4;
     WindowPosition windowPositions[] = {
-        //WindowPosition(GetDlgItem(hwnd, IdcTags), PositionOptionsFillHeight | PositionOptionsAlignTop),
-        WindowPosition(GetDlgItem(hwnd, IdcFontCollectionFilter), PositionOptionsFillHeight),
+        WindowPosition(GetDlgItem(hwnd, IdcText), PositionOptionsFillWidth | PositionOptionsAlignTop),
+        WindowPosition(GetDlgItem(hwnd, IdcFontCollectionFilter), PositionOptionsFillHeight | PositionOptionsNewLine),
         WindowPosition(GetDlgItem(hwnd, IdcFontCollectionList), PositionOptionsFillWidth | PositionOptionsFillHeight),
         WindowPosition(GetDlgItem(hwnd, IdcLog), PositionOptionsFillWidth | PositionOptionsAlignTop | PositionOptionsNewLine),
     };
@@ -2988,6 +3002,14 @@ HRESULT MainWindow::PopFilter(
 }
 
 
+HRESULT MainWindow::InitializeDisplayTextEdit()
+{
+    HWND hwndText = GetDlgItem(hwnd_, IdcText);
+    Edit_SetCueBannerText(hwndText, L"(icon display text)");
+    return S_OK;
+}
+
+
 HRESULT MainWindow::InitializeLanguageMenu()
 {
     HMENU mainMenu = GetMenu(hwnd_);

FontSetViewer.h

@@ -125,6 +125,7 @@ class MainWindow
     STDMETHODIMP CopyToClipboard(bool copyPlainText = false);
     STDMETHODIMP CopyImageToClipboard();
     STDMETHODIMP PasteFromClipboard();
+    STDMETHODIMP InitializeDisplayTextEdit();
     STDMETHODIMP InitializeLanguageMenu();
     STDMETHODIMP InitializeFontCollectionListUI();
     STDMETHODIMP InitializeFontCollectionFilterUI();

FontSetViewer.png

@@ -22,32 +22,29 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{04E57A88-8763-438D-8E73-8573C01A6AC4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
@@ -161,10 +158,7 @@
     <ClCompile Include="FontSetViewer.cpp" />
     <ClCompile Include="font\DWritEx.cpp" />
     <ClCompile Include="precomp.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -181,13 +175,21 @@
     <ClInclude Include="font\DWritEx.h" />
     <ClInclude Include="font\precomp.h" />
     <ClInclude Include="precomp.h" />
-    <ClInclude Include="resources\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="precomp.inc" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources\FontSetViewer.rc" />
+    <Image Include="resources\DWriteIcon.ico" />
+    <Image Include="resources\family-blank.ico" />
+    <Image Include="resources\font-blank.ico" />
+    <Image Include="resources\FontSetFilterIcons.bmp" />
+    <Image Include="resources\FontSetFilterIcons24bit.bmp" />
+    <ClInclude Include="resources\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="resources\FontSetViewer.manifest" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

FontSetViewer.vcxproj

@@ -16,7 +16,7 @@
 #define IdbFontCollectionFilter             4
 
 #define IdcLog                              1000
-#define IdcTags                             1001
+#define IdcText                             1001
 #define IdcFontCollectionList               1002
 #define IdcFontCollectionFilter             1003
 #define IdcActivateFont                     1004