Merge branch 'master' of https://github.com/fdwr/TextLayoutSampler

Author: fdwr

resource/MainWindow.rc

@@ -700,7 +700,6 @@ void DrawingCanvas::DrawGrid(uint32_t color, uint32_t step)
             {
                 xLineMod = 0;
             }
-            // Duplicate the alpha channel in the other three color channels.
             destRow[x] = pixelColor;
         }
         ++yMod;
@@ -863,7 +862,9 @@ namespace
         return S_OK;
     }
 
-    uint32_t GetSolidLineCount(
+    // Using the top left pixel as a reference color (like chroma key), and which direction to start from,
+    // count how many ignorable padding lines there are of the same color.
+    uint32_t GetIgnorablePaddingLineCount(
         uint32_t* pixels,
         size_t bytesPerRow,
         uint32_t width,
@@ -963,10 +964,10 @@ namespace
         {
             const size_t bytesPerRow = sourceBitmapInfo.dsBm.bmWidthBytes;
             uint32_t* pixels = reinterpret_cast<uint32_t*>(sourceBitmapInfo.dsBm.bmBits);
-            top     = GetSolidLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapHeight, 0);
-            bottom -= GetSolidLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapHeight - top, 1);
-            left    = GetSolidLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapWidth, 2);
-            right  -= GetSolidLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapWidth - left, 3);
+            top     = GetIgnorablePaddingLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapHeight, 0);
+            bottom -= GetIgnorablePaddingLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapHeight - top, 1);
+            left    = GetIgnorablePaddingLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapWidth, 2);
+            right  -= GetIgnorablePaddingLineCount(pixels, bytesPerRow, bitmapWidth, bitmapHeight, bitmapWidth - left, 3);
 
             top     = std::max(int32_t(top    - padding), 0);
             bottom  = std::min(int32_t(bottom + padding), int32_t(bitmapHeight));

resource/resource.h

@@ -95,7 +95,7 @@ LRESULT CALLBACK DrawingCanvasControl::WindowProc(HWND hwnd, UINT message, WPARA
         }
         break;
 
-    case WM_DESTROY:
+    case WM_NCDESTROY:
         {
             LRESULT result = DefWindowProc(hwnd, message, wParam, lParam);
             delete this;

source/DrawingCanvas.ixx

@@ -167,7 +167,7 @@ void MainWindow::RegisterCustomClasses()
     INITCOMMONCONTROLSEX icex;
     icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
     icex.dwICC  = ICC_LISTVIEW_CLASSES;
-    InitCommonControlsEx(&icex); 
+    InitCommonControlsEx(&icex);
 
     DrawingCanvasControl::RegisterWindowClass(Application::g_hModule);
 }
@@ -187,6 +187,7 @@ MainWindow* MainWindow::GetClass(HWND hwnd)
 
 INT_PTR CALLBACK MainWindow::StaticDialogProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+    // Create the window the first time.
     MainWindow* window = GetClassFromDialog<MainWindow>(hwnd);
     if (window == nullptr)
     {
@@ -478,10 +479,11 @@ INT_PTR MainWindow::InitializeMainDialog()
     // UpdateAttributesListView();
     // UpdateAttributeValuesListView();
 
-    AppendLog(u"Mouse wheel scrolls, middle button drag pans, right click opens menu, left click selects object (ctrl to toggle). "
-              u"You can select multiple objects in the list to change an attribute across all.\r\n"
-              u"Double click cell to edit. Press delete key to delete selected object. Press delete in attribute list to clear value.\r\n"
-              );
+    AppendLog(
+        u"Mouse wheel scrolls, middle button drag pans, right click opens menu, left click selects object (ctrl to toggle). "
+        u"You can select multiple objects in the list to change an attribute across all.\r\n"
+        u"Double click cell to edit. Press delete key to delete selected object. Press delete in attribute list to clear value.\r\n"
+    );
 
     uint32_t controlIdToSetFocusTo = 0;
     static_assert(SettingsVisibilityTotal == 3, "");