Display object selection in viewing window even without ListView control by changing object label color.

Ctrl+left click on viewing window now toggles selection.
Enable buttons copy, delete, shift even in simple settings mode.

Author: fdwr

Common.ArrayRef.natvis

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="array_ref&lt;*&gt;">
+      <DisplayString>{{ Count={end_ - begin_} }}</DisplayString>
+      <Expand>
+          <Item Name="[Count]" ExcludeView="simple">end_ - begin_</Item>
+          <ArrayItems>
+              <Size>end_ - begin_</Size>
+              <ValuePointer>begin_</ValuePointer>
+          </ArrayItems>
+      </Expand>
+  </Type>
+</AutoVisualizer>

Common.AutoResource.h

@@ -90,6 +90,12 @@ class AutoResource
         ResourceTypePolicy::Acquire(resource_);
     }
 
+    AutoResource(Self&& other)
+    {
+        resource_ = other.resource_;
+        ResourceTypePolicy::InitializeEmpty(Cast(&other.resource_));
+    }
+
     inline AutoResource()
     {
         ResourceTypePolicy::InitializeEmpty(Cast(&resource_));
@@ -186,7 +192,7 @@ class AutoResource
         return Set(other.resource_);
     }
 
-    inline ResourceType Set(Self&& other)
+    ResourceType Set(Self&& other)
     {
         if (other.resource_ != resource_)
         {
@@ -211,6 +217,12 @@ class AutoResource
         return *this;
     }
 
+    inline Self& operator=(Self&& resource)
+    {
+        Set(std::move(resource));
+        return *this;
+    }
+
     // No check. Just set it directly.
     inline ResourceType SetDirectly(ResourceType resource)
     {

Common.h

@@ -62,6 +62,15 @@ bool TestBit(void const* memoryBase, uint32_t bitIndex) noexcept;
 bool ClearBit(void* memoryBase, uint32_t bitIndex) noexcept;
 bool SetBit(void* memoryBase, uint32_t bitIndex) noexcept;
 
+// Returns true if current flags were updated (false if unchanged).
+template<typename EnumType>
+bool UpdateFlags(IN OUT EnumType& currentFlags, bool condition, EnumType flagsWhenTrue)
+{
+    EnumType previousFlags = currentFlags;
+    currentFlags = (previousFlags & ~flagsWhenTrue) | (condition ? flagsWhenTrue : EnumType(0));
+    return previousFlags != currentFlags;
+}
+
 template<typename T>
 T* PtrAddByteOffset(T* p, size_t offset)
 {

DrawableObjectAndValues.h

@@ -37,6 +37,14 @@ EXPORT_BEGIN
 // Combination of the drawable object and its associated attribute values.
 struct DrawableObjectAndValues : public IAttributeSource
 {
+public:
+    enum Flags : uint32_t
+    {
+        FlagsNone     = 0x00000000,
+        FlagsSelected = 0x00000001,
+        FlagsInitialDefaults = FlagsSelected,
+    };
+
 public:
     ComPtr<DrawableObject> drawableObject_;
     AttributeValue values_[DrawableObjectAttributeTotal];
@@ -45,10 +53,14 @@ struct DrawableObjectAndValues : public IAttributeSource
     D2D_RECT_F objectRect_;     // Object rectangle in post-transform canvas coordinates. Best rounded to whole pixel.
     D2D_RECT_F layoutBounds_;   // Extents of layout boundary, in pre-transform world coordinates.
     D2D_RECT_F contentBounds_;  // Actual content boundary, in pre-transform world coordinates.
-    CachedTransform transform_; // Transform from world coordinates to 
+    CachedTransform transform_; // Transform from world coordinates to screen.
     D2D_POINT_2F origin_;       // Offset from <0,0>. May be non-zero if rotation exists or content is larger than layout.
+    Flags flags_;
 
 public:
+    DrawableObjectAndValues();
+    DrawableObjectAndValues(DrawableObjectAndValues const&) = default;
+
     // IAttributeSource implementation.
     virtual HRESULT GetString(uint32_t id, _Out_ array_ref<char16_t>& value) override;
     using IAttributeSource::GetString;
@@ -140,4 +152,6 @@ struct DrawableObjectAndValues : public IAttributeSource
         );
 };
 
+DEFINE_ENUM_FLAG_OPERATORS(DrawableObjectAndValues::Flags);
+
 EXPORT_END

DrawableObjectAndValues.ixx

@@ -30,6 +30,18 @@ namespace
 
     static const COLORREF s_defaultLabelTextColor = 0x00FFFFFF;
     static const COLORREF s_defaultErrorTextColor = 0x004040FF;
+    static const COLORREF s_defaultLabelBackColor = 0x00805050;
+}
+
+
+DrawableObjectAndValues::DrawableObjectAndValues()
+:   labelRect_{},
+    objectRect_{},    // Object rectangle in post-transform canvas coordinates. Best rounded to whole pixel.
+    layoutBounds_{},
+    contentBounds_{},
+    origin_{},
+    flags_{FlagsSelected}
+{
 }
 
 
@@ -158,7 +170,8 @@ void DrawableObjectAndValues::Draw(
             SetWorldTransform(currentHdc, &finalTransform.gdi);
             HFONT previousFont = SelectFont(currentHdc, labelFont);
             SetTextColor(currentHdc, s_defaultErrorTextColor);
-            SetBkMode(currentHdc, TRANSPARENT);
+            SetBkMode(currentHdc, OPAQUE);
+            SetBkColor(currentHdc, s_defaultLabelBackColor);
             DrawText(currentHdc, ToWChar(errorString.c_str()), int(errorString.size()), &errorRect, DT_NOCLIP | DT_NOPREFIX);
             SelectFont(currentHdc, previousFont);
             SetWorldTransform(currentHdc, &DrawableObject::identityTransform.gdi);
@@ -204,29 +217,21 @@ void DrawableObjectAndValues::Draw(
         {
             HFONT previousFont = SelectFont(hdc, labelFont);
             SetTextColor(hdc, s_defaultLabelTextColor);
-            SetBkMode(hdc, TRANSPARENT);
+            if (objectAndValues.flags_ & DrawableObjectAndValues::FlagsSelected)
+            {
+                SetBkMode(hdc, OPAQUE);
+                SetBkColor(hdc, s_defaultLabelBackColor);
+            }
+            else
+            {
+                SetBkMode(hdc, TRANSPARENT);
+            }
             DrawText(hdc, ToWChar(objectAndValues.label_.data()), int(objectAndValues.label_.size()), &objectAndValues.labelRect_, DT_NOCLIP | DT_NOPREFIX);
             SelectFont(hdc, previousFont);
         }
     }
     SetWorldTransform(hdc, &DrawableObject::identityTransform.gdi);
     drawingCanvas.SwitchRenderingAPI(DrawingCanvas::CurrentRenderingApiAny);
-
-    #if 0 // todo::: delete hack
-    DrawingCanvas::RawPixels rawPixels = drawingCanvas.GetRawPixels();
-    std::vector<Edge> edges = {{0,1},{1,2},{2,3},{3,4},{4,5},{5,6},{6,7},{7,0},  {8,9},{9,10},{10,11},{11,8},  {12,13},{13,14},{14,15},{15,12}};
-    std::vector<PointI> points = {{100,100},{150,0},{250,150},{250,0},{300,100},{250,200},{150,50},{150,200},  {400,150},{600,200},{350,350},{300,250},  {400,200},{450,250},{400,275},{350,250}};
-    FillPolyline(rawPixels, canvasTransform, points, IN OUT edges, 0xFFE080C0);
-    //DrawLineTransformed(
-    //    rawPixels,
-    //    canvasTransform,
-    //    100,
-    //    100,
-    //    100,
-    //    200,
-    //    0xFFE080C0
-    //    );
-    #endif
 }
 
 

DrawingCanvasControl.ixx

@@ -112,8 +112,6 @@ LRESULT CALLBACK DrawingCanvasControl::WindowProc(HWND hwnd, UINT message, WPARA
             GetCursorPos(&cursorPoint);
             TrackPopupMenu(menu, TPM_LEFTALIGN|TPM_NOANIMATION|TPM_RIGHTBUTTON, cursorPoint.x, cursorPoint.y, 0, hwnd, 0);
             DestroyMenu(menu);
-
-            SendMouseNotification();
         }
         break;
 
@@ -137,7 +135,6 @@ LRESULT CALLBACK DrawingCanvasControl::WindowProc(HWND hwnd, UINT message, WPARA
     case WM_LBUTTONUP:
     case WM_MBUTTONUP:
         ReleaseCapture();
-        SendMouseNotification();
         break;
 
     case WM_CAPTURECHANGED:
@@ -209,8 +206,6 @@ LRESULT CALLBACK DrawingCanvasControl::WindowProc(HWND hwnd, UINT message, WPARA
             {
                 Pan(xDif, yDif);
             }
-
-            SendMouseNotification();
         }
         break;
 

MainWindow.h

@@ -96,7 +96,7 @@ class MainWindow
     void FillAttributesListView();
     void InitializeAttributeValuesListView();
     void UpdateUi();
-    void DeferUpdateUi(NeededUiUpdate neededUiUpdate = NeededUiUpdateNone);
+    void DeferUpdateUi(NeededUiUpdate neededUiUpdate = NeededUiUpdateNone, uint32_t timeOut = 50);
     void UpdateDrawableObjectsListView();
     void DeleteDrawableObjectsListViewSelected();
     void CreateDrawableObjectsListViewSelected();
@@ -117,7 +117,7 @@ class MainWindow
     void Resize(int id);
     HRESULT SelectFontFile();
     HRESULT SelectFontFamily();
-    std::vector<uint32_t> GetSelectedDrawableObjectIndices();
+    std::vector<uint32_t> GetSelectedDrawableObjectIndices(bool returnAllIfEmpty = true);
     std::vector<uint32_t> GetSelectedAttributeIndices();
     HRESULT GetFileOrFamilyName(uint32_t selectedDrawableObjectIndex, _Out_ std::u16string& fileOrFamilyName);