12.1: feathered selections, Select Subject, Soft Light, the fixed-width font menu (Compositor 1.1.1–1.1.4)

src/Rendering/InlineTextEditor.cpp

@@ -37,7 +37,15 @@ void InlineTextEditor::synchronize(const TextDraft &draft)
     }
     const LayerTextStyle &style = draft.style;
     // Point text has no box: it is what is typed.
-    m_logicalSize = EditorSession::textBoxSize(style);
+    if (style.boxSize) {
+        m_logicalSize = *style.boxSize;
+    } else {
+        if (m_measuredStyle != style) {
+            m_measuredSize = EditorSession::textBoxSize(style);
+            m_measuredStyle = style;
+        }
+        m_logicalSize = m_measuredSize;
+    }
     LayerTransform transform = draft.transform.value_or(LayerTransform{.origin = draft.origin, .size = m_logicalSize});
     // Point text grows at its layer's scale, corner kept.
     const int index = draft.layerID ? indexOf(document.layers, *draft.layerID) : -1;

src/Rendering/InlineTextEditor.h

@@ -136,6 +136,9 @@ private:
     QUuid m_draftID;
     std::optional<LayerTextStyle> m_shownStyle;
     QSizeF m_logicalSize{360, 160};
+    // Point text's measure, kept while its style holds.
+    std::optional<LayerTextStyle> m_measuredStyle;
+    QSizeF m_measuredSize;
     LayerTransform m_shownTransform;
     double m_handleSize = 6;
     std::unique_ptr<TextLines> m_lines;

src/Rendering/LayerRenderer.cpp

@@ -20,6 +20,8 @@ QPainter::CompositionMode compositionMode(LayerBlendMode mode)
         return QPainter::CompositionMode_Screen;
     case LayerBlendMode::overlay:
         return QPainter::CompositionMode_Overlay;
+    case LayerBlendMode::softLight:
+        return QPainter::CompositionMode_SoftLight;
     case LayerBlendMode::darken:
         return QPainter::CompositionMode_Darken;
     case LayerBlendMode::lighten: