merge: integrate adaptive glass and interaction improvements

Author: Fryingpan-Jason

experiments/glass_control_island.h

@@ -14,6 +14,7 @@
 #include <functional>
 #include <string>
 #include <utility>
+#include "../src/glass_control_appearance.h"
 
 namespace GlassControlIsland {
 
@@ -23,8 +24,7 @@ namespace Detail {
 // elasticity without changing its anchored edge or its hit-test footprint.
 struct Spring {
     float value = 0, velocity = 0;
-    bool Step(float target, float seconds) {
-        constexpr float frequency = 22.0f, damping = 0.74f;
+    bool Step(float target, float seconds, float frequency=22.0f, float damping=0.74f) {
         const float dt = std::clamp(seconds, 0.0f, 1.0f);
         const float decayRate = frequency * damping;
         const float dampedFrequency = frequency * std::sqrt(1.0f - damping * damping);
@@ -99,7 +99,7 @@ class Controller {
                     static_cast<LONG>(std::lround(centerY + radius))};
         }
     };
-    Controller() = default;
+    Controller() {appearanceFade_.Reset(RGB(0,0,0));}
     Controller(const Controller&) = delete;
     Controller& operator=(const Controller&) = delete;
     ~Controller() { Destroy(); }
@@ -186,7 +186,8 @@ class Controller {
 
     void Update(const RECT& noteRect, UINT dpi, bool visible, bool topmost,
                 bool passThrough, bool menuOpen, HWND noteWindow = nullptr, int cornerRadiusPx = 0,
-                bool folded = false, float foldProgress = 1.0f, bool noteTransition = false) {
+                bool folded = false, float foldProgress = 1.0f, bool noteTransition = false,
+                COLORREF backingColour=0,int backingAlpha=0) {
         if (!window_)
             return;
         const UINT newDpi = dpi ? dpi : 96;
@@ -206,7 +207,11 @@ class Controller {
         menuOpen_ = effectiveMenuOpen;
         // Retain the API for the host, but note/body hover and note capture are
         // deliberately no longer expansion sources, including click-through.
-        (void)noteWindow;
+        DWORD affinity=WDA_NONE;
+        if(noteWindow)GetWindowDisplayAffinity(noteWindow,&affinity);
+        appearanceRequest_.note=noteRect;appearanceRequest_.tint=backingColour;
+        appearanceRequest_.radius=cornerRadiusPx;
+        appearanceRequest_.alpha=!folded && affinity==WDA_EXCLUDEFROMCAPTURE?std::clamp(backingAlpha,0,255):0;
         noteRect_ = noteRect;
         cornerRadiusPx_ = std::max(0, cornerRadiusPx);
         const bool previousBelow = below_;
@@ -239,6 +244,7 @@ class Controller {
                          (flags & ~(SWP_SHOWWINDOW | SWP_HIDEWINDOW)));
         }
         if (!visible) {
+            appearanceRequest_.enabled=false;appearanceSampler_.Submit(appearanceRequest_);
             KillTimer(window_, kHoverTimer);
             KillTimer(window_, kMotionTimer);
             motionRunning_ = false;
@@ -273,9 +279,12 @@ class Controller {
         PollHover();
         if (geometryChanged || appearanceChanged || visibilityChanged || previousBelow != below_)
             Render();
+        PollAppearance();
     }
 
     void Destroy() {
+        appearanceSampler_.Stop();
+        for(auto& raster:rasters_)raster.Clear();
         closePointerDown_ = false;
         if (closeWindow_) {
             if (GetCapture() == closeWindow_) ReleaseCapture();
@@ -378,6 +387,13 @@ class Controller {
     Detail::Spring foldedHover_;
     Detail::DotImpulse dotImpulse_;
     float settingsTint_ = 0, closeTint_ = 0;
+    std::array<GlassControlAppearance::Raster,2> rasters_;
+    GlassControlAppearance::Sampler appearanceSampler_;
+    GlassControlAppearance::Request appearanceRequest_;
+    GlassAutoInk::Decision appearanceDecision_;
+    GlassAutoInk::Fade appearanceFade_;
+    unsigned appearanceSeen_=0;
+    float lightAppearance_=0;
     float foldProgress_ = 1.0f;
     bool noteTransition_ = false, transitionToFold_ = false;
     float insideCenterY_ = 0, outsideCenterY_ = 0, foldedCenterY_ = 0;
@@ -666,6 +682,7 @@ class Controller {
     void Animate() {
         if (!window_ || !visible_) return;
         if (reduceMotion_) {
+            lightAppearance_=GetRValue(appearanceFade_.target)/255.f;
             dotImpulse_.Clear();
             expansion_.value = expanded_ && ExpansionAllowed() ? 1.0f : 0.0f;
             expansion_.velocity = 0;
@@ -690,7 +707,11 @@ class Controller {
         const ULONGLONG now = GetTickCount64();
         const float seconds = static_cast<float>(now - lastMotionTick_) / 1000.0f;
         lastMotionTick_ = now;
-        bool active = expansion_.Step(expanded_ && ExpansionAllowed() ? 1.0f : 0.0f, seconds);
+        // A faster, more pronounced rise and a short elastic settle. Retain
+        // velocity when the pointer reverses instead of restarting an easing.
+        bool active = expansion_.Step(expanded_ && ExpansionAllowed() ? 1.0f : 0.0f, seconds, 32.0f, 0.72f);
+        lightAppearance_=GetRValue(appearanceFade_.Sample(double(now)))/255.f;
+        active |= appearanceFade_.Running(double(now));
         active |= foldedHover_.Step(folded_ && !noteTransition_ && !inputSuppressed_ && hover_ ? 1.0f : 0.0f, seconds);
         active |= Detail::Fade(settingsTint_, hover_ && !closeHover_ && !inputSuppressed_ && !noteTransition_ ? 1.0f : 0.0f, seconds);
         active |= Detail::Fade(closeTint_, closeHover_ && ExpansionAllowed() ? 1.0f : 0.0f, seconds);
@@ -703,6 +724,28 @@ class Controller {
             KillTimer(window_, kMotionTimer);
             motionRunning_ = false;
         }
+        PollAppearance();
+    }
+
+    void PollAppearance() {
+        auto request=appearanceRequest_;
+        const auto rectangles=VisibleSurfaceRects();request.surface=rectangles[0];
+        if(rectangles[1].right>rectangles[1].left)UnionRect(&request.surface,&request.surface,&rectangles[1]);
+        request.padding=std::max(6,Scale(6));request.guard=std::max(2,Scale(3));
+        request.enabled=visible_ && !highContrast_ && !noteTransition_ && !inputSuppressed_;
+        appearanceSampler_.Submit(request);
+        double share=0;
+        if(appearanceSampler_.Read(appearanceSeen_,share))appearanceDecision_.Update(share,double(GetTickCount64()));
+        // Keep the chosen X colour throughout red hover, including its retreat.
+        if(closeHover_ || closePointerDown_ || closeTint_>.001f) {
+            const int c=int(std::lround(lightAppearance_*255));appearanceFade_.Reset(RGB(c,c,c));return;
+        }
+        if(!request.enabled || !appearanceDecision_.valid)return;
+        const COLORREF target=appearanceDecision_.white?RGB(255,255,255):RGB(0,0,0);
+        if(!appearanceFade_.initialized || appearanceFade_.target!=target) {
+            const int c=int(std::lround(lightAppearance_*255));
+            appearanceFade_.Aim(target,RGB(c,c,c),double(GetTickCount64()));Animate();
+        }
     }
 
     static void RoundPath(Gdiplus::GraphicsPath& path, float x, float y,
@@ -777,22 +820,9 @@ class Controller {
         const int height = static_cast<int>(bounds_.bottom - bounds_.top);
         if (width <= 0 || height <= 0)
             return;
-        BITMAPINFO info{};
-        info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-        info.bmiHeader.biWidth = width;
-        info.bmiHeader.biHeight = -height;
-        info.bmiHeader.biPlanes = 1;
-        info.bmiHeader.biBitCount = 32;
-        info.bmiHeader.biCompression = BI_RGB;
-        void* pixels = nullptr;
-        HDC dc = CreateCompatibleDC(nullptr);
-        HBITMAP dib = CreateDIBSection(dc, &info, DIB_RGB_COLORS, &pixels, nullptr, 0);
-        if (!dc || !dib || !pixels) {
-            if (dib) DeleteObject(dib);
-            if (dc) DeleteDC(dc);
-            return;
-        }
-        const HGDIOBJ old = SelectObject(dc, dib);
+        auto& raster=rasters_[close?1:0];
+        if(!raster.Ensure(width,height))return;
+        void* pixels=raster.pixels;HDC dc=raster.dc;
         {
             // GDI+ writes premultiplied BGRA directly, including edge coverage.
             // Do not re-premultiply these pixels after drawing.
@@ -838,15 +868,12 @@ class Controller {
             graphics.TranslateTransform(38.0f, centerY);
             graphics.ScaleTransform(surface.width / 72.0f, 1.0f);
             graphics.TranslateTransform(-38.0f, -centerY);
-            const float materialWeight = std::max(glyphAlpha, folded_ ? foldProgress_ : 0.0f);
-            Gdiplus::Color background = Mix(Gdiplus::Color(248, 64, 66, 70),
-                                              Gdiplus::Color(248, 48, 50, 54), materialWeight);
-            Gdiplus::Color settingsBackground = Mix(background, Gdiplus::Color(252, 72, 75, 80), settingsTint_);
+            Gdiplus::Color background = Mix(Gdiplus::Color(255,0,0,0),Gdiplus::Color(255,255,255,255),lightAppearance_);
+            Gdiplus::Color settingsBackground = background;
             Gdiplus::Color closeBackground = Mix(background, Gdiplus::Color(255, 220, 52, 65), closeTint_);
             closeBackground = Mix(settingsBackground, closeBackground, separation);
-            Gdiplus::Color foreground(255, 245, 247, 251);
-            Gdiplus::Color closeForeground = Mix(Gdiplus::Color(255, 255, 112, 113),
-                                                   Gdiplus::Color(255, 255, 255, 255), closeTint_);
+            Gdiplus::Color foreground(255,255-background.GetR(),255-background.GetG(),255-background.GetB());
+            Gdiplus::Color closeForeground = foreground;
             if (highContrast_) {
                 const COLORREF bg = GetSysColor(COLOR_BTNFACE), fg = GetSysColor(COLOR_BTNTEXT);
                 settingsBackground = Gdiplus::Color(255, GetRValue(bg), GetGValue(bg), GetBValue(bg));
@@ -870,9 +897,7 @@ class Controller {
             Gdiplus::SolidBrush closeFill(closeBackground);
             graphics.FillPath(&closeFill, &path);
             graphics.Restore(surfaceClip);
-            Gdiplus::Pen rim(Gdiplus::Color(highContrast_ ? 255 : 52, foreground.GetR(), foreground.GetG(),
-                                           foreground.GetB()), 0.65f);
-            graphics.DrawPath(&rim, &path);
+            if(highContrast_) {Gdiplus::Pen rim(foreground,0.65f);graphics.DrawPath(&rim,&path);}
             if (glyphAlpha > 0) {
                 Gdiplus::Color crossColor(static_cast<BYTE>(255 * glyphAlpha), closeForeground.GetR(),
                                           closeForeground.GetG(), closeForeground.GetB());
@@ -887,6 +912,10 @@ class Controller {
                 line.SetStartCap(Gdiplus::LineCapRound);
                 line.SetEndCap(Gdiplus::LineCapRound);
                 Gdiplus::SolidBrush knob(glyph);
+                const auto glyphTransform=graphics.Save();
+                graphics.TranslateTransform(24,centerY);
+                graphics.ScaleTransform(1+.06f*settingsTint_,1+.06f*settingsTint_);
+                graphics.TranslateTransform(-24,-centerY);
                 // Original vector artwork: three adjustment tracks with alternating
                 // handles, not a vendor font glyph or an embedded platform asset.
                 const float rows[] = {centerY - 5.0f, centerY, centerY + 5.0f};
@@ -897,9 +926,9 @@ class Controller {
                     graphics.FillEllipse(&cutout, handles[row] - 3, rows[row] - 3, 6.0f, 6.0f);
                     graphics.FillEllipse(&knob, handles[row] - 1.9f, rows[row] - 1.9f, 3.8f, 3.8f);
                 }
+                graphics.Restore(glyphTransform);
                 if (passThrough_) {
-                    Gdiplus::SolidBrush status(highContrast_ ? glyph :
-                        Gdiplus::Color(static_cast<BYTE>(255 * glyphAlpha), 111, 190, 255));
+                    Gdiplus::SolidBrush status(glyph);
                     graphics.FillEllipse(&status, 36.0f, centerY + 5.0f, 2.5f, 2.5f);
                 }
             }
@@ -919,9 +948,6 @@ class Controller {
         SIZE size{width, height};
         BLENDFUNCTION blend{AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
         UpdateLayeredWindow(target, nullptr, &destination, &size, dc, &source, 0, &blend, ULW_ALPHA);
-        SelectObject(dc, old);
-        DeleteObject(dib);
-        DeleteDC(dc);
     }
 
     void FinishPointer(bool click) {
@@ -1123,6 +1149,7 @@ class Controller {
             }
             if (wp == kHoverTimer) {
                 PollHover();
+                PollAppearance();
                 return 0;
             }
             break;

experiments/glass_experience.h

@@ -4,6 +4,7 @@
 #include "glass_close_behavior.h"
 #include "glass_experience_policy.h"
 #include "glass_absorb_motion.h"
+#include "../src/glass_window_stacking.h"
 #include <functional>
 
 namespace {
@@ -85,21 +86,15 @@ void SyncExperienceUI() {
     experienceIsland.Update(anchor,GetDpiForWindow(g_window),g_isVisible && (experienceFolded || IsWindowVisible(g_window)) && !IsIconic(g_window),
         state.pinned,state.passThrough,experiencePanel.Visible() || experienceCloseDialogOpen || experienceColorDialogOpen,
         g_window,ScaleForDpi(g_window,NoteCornerRadius()),experienceFolded || ExperienceAbsorbing(),
-        experienceAbsorbProgress,ExperienceAbsorbing());
+        experienceAbsorbProgress,ExperienceAbsorbing(),g_settings.themeColor,
+        std::max(g_settings.passThrough?0:1,MulDiv(EffectiveOpacityPercent(),255,100)));
     // Activation/restoration can raise the note above its independent hint.
     // Insert the controls immediately above the note, preserving applications
     // already above it rather than raising the controls to the top of the band.
     if(IsWindowVisible(g_window) && IsWindowVisible(experienceIsland.Window())) {
-        int remaining=64;
-        for(HWND above=GetWindow(experienceIsland.Window(),GW_HWNDPREV);above && --remaining;
-            above=GetWindow(above,GW_HWNDPREV))if(above==g_window) {
-                HWND insert=GetWindow(g_window,GW_HWNDPREV);
-                if(!insert || (!state.pinned && (GetWindowLongPtrW(insert,GWL_EXSTYLE)&WS_EX_TOPMOST)))insert=HWND_TOP;
-                SetWindowPos(experienceIsland.Window(),insert,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
-                if(IsWindowVisible(experienceIsland.CloseWindow()))SetWindowPos(experienceIsland.CloseWindow(),insert,
-                    0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
-                break;
-            }
+        GlassWindowStacking::PlaceAbove(experienceIsland.Window(),g_window,state.pinned);
+        if(IsWindowVisible(experienceIsland.CloseWindow()))
+            GlassWindowStacking::PlaceAbove(experienceIsland.CloseWindow(),experienceIsland.Window(),state.pinned);
     }
     SyncExperienceCapture();
     experiencePanel.UpdateState(state);
@@ -265,7 +260,8 @@ void ExpandExperienceNote() {
     experienceAbsorbInputBlocked=true;experienceAbsorbReleased=0;
     experienceEndpointPresented=false;experienceMotionGeometryMismatches=0;experienceAbsorbProgress=1;experienceAbsorbAlpha=1;
     experienceIsland.SetInputSuppressed(true);
-    SaveExperienceRestoreSize();SaveSettings();
+    // Persist the final restore state at completion, not on the click path.
+    g_backdrop.SetPresentationMotion(true);
     // Establish the real start at the currently drawn (possibly hovered) dot.
     // Geometry is never enlarged after the curve computes its pixel bounds.
     SyncExperienceUI();
@@ -337,6 +333,7 @@ void MaybeAbsorbExperienceResize() {
         experienceNativeSizing=false;return;
     }
     experienceNativeSizing=false;experiencePanel.Close(false);KillTimer(g_window,kCaretTimer);
+    g_backdrop.SetPresentationMotion(true);
     // Take over this gesture before moving/hiding the grip. Its queued up or
     // capture-lost notifications may still arrive, but cannot restart resizing.
     g_pointerDown=false;g_pointerDragged=false;
@@ -372,7 +369,7 @@ void TickExperienceAbsorb() {
             // the dot/text. Never skip from the last larger rectangle to hidden.
             if(frame.progress>=1)experienceEndpointPresented=true;
         } else if(!restoring) {
-            ShowWindow(g_window,SW_HIDE);g_backdrop.Enable(g_window,false);
+            ShowWindow(g_window,SW_HIDE);g_backdrop.SuspendForFold();
             g_backdrop.SetPresentationOpacity(1.0f);
             experienceAbsorbing=false;experienceFolded=true;experienceAbsorbAlpha=1;
             // Keep saved/restore geometry at the original thin-card anchor, not
@@ -383,6 +380,7 @@ void TickExperienceAbsorb() {
             SaveSettings();SaveExperienceRestoreSize();
         } else {
             experienceRestoring=false;experienceAbsorbAlpha=1;
+            g_backdrop.SetPresentationMotion(false);
             g_backdrop.SetPresentationOpacity(1.0f);
             UpdateLayout(g_window);SaveSettings();SaveExperienceRestoreSize();SaveGlassLabPreferences();
         }
@@ -496,6 +494,9 @@ void CreateExperienceUI() {
 }
 void DestroyExperienceUI() {
     KillTimer(g_window,73);KillTimer(g_window,74);KillTimer(g_window,75);KillTimer(g_window,76);
+    // Restore persistence is deferred off the click path; closing mid-motion
+    // must still save the intended final state before controls are destroyed.
+    if(experienceReady)SaveExperienceRestoreSize();
     SaveExperienceMaterial();experienceReady=false;
     // The popup borrows the note's dispatcher queue; destroy it first.
     experiencePanel.Destroy();experienceIsland.Destroy();

src/glass_auto_ink.h

@@ -0,0 +1,65 @@
+#pragma once
+#include <windows.h>
+#include <algorithm>
+#include <array>
+#include <cmath>
+
+namespace GlassAutoInk {
+constexpr COLORREF Dark=RGB(30,32,36),Light=RGB(248,249,250);
+inline double Luminance(COLORREF colour) {
+    static const auto linear=[] {
+        std::array<double,256> table{};
+        for(int i=0;i<256;i++){double c=i/255.;table[i]=c<=.04045?c/12.92:std::pow((c+.055)/1.055,2.4);}
+        return table;
+    }();
+    return .2126*linear[GetRValue(colour)]+.7152*linear[GetGValue(colour)]+.0722*linear[GetBValue(colour)];
+}
+inline bool PrefersWhite(COLORREF colour) {
+    static const double boundary=std::sqrt((Luminance(Dark)+.05)*(Luminance(Light)+.05))-.05;
+    return Luminance(colour)<boundary;
+}
+// Vote per area sample AFTER the actual overlay's byte-space alpha blend.
+// Averaging colours first would incorrectly turn a black/white split into grey.
+inline double WhiteShare(const void* data,unsigned pitch,int width,int height,COLORREF tint,int alpha) {
+    unsigned white=0;
+    alpha=std::clamp(alpha,0,255);
+    for(int y=0;y<height;y++)for(int x=0;x<width;x++) {
+        const auto p=static_cast<const unsigned char*>(data)+size_t(y)*pitch+x*4;
+        auto blend=[alpha](int b,int t){return (b*(255-alpha)+t*alpha+127)/255;};
+        white+=PrefersWhite(RGB(blend(p[2],GetRValue(tint)),blend(p[1],GetGValue(tint)),blend(p[0],GetBValue(tint))));
+    }
+    return width>0 && height>0 ? double(white)/(double(width)*height) : .5;
+}
+struct Decision {
+    bool white=false,valid=false,pending=false,candidate=false;
+    double candidateAt=0;
+    void Reset(bool fallbackWhite=false){*this={};white=fallbackWhite;}
+    void Update(double share,double now) {
+        if(!valid){if(share>.55)white=true;else if(share<.45)white=false;valid=true;return;}
+        bool next=share>.55?true:share<.45?false:white;
+        if(next==white){pending=false;return;}
+        if(share>=.85 || share<=.15){white=next;pending=false;return;}
+        if(!pending || candidate!=next){pending=true;candidate=next;candidateAt=now;return;}
+        if(now-candidateAt>=90){white=next;pending=false;}
+    }
+};
+struct Fade {
+    static constexpr double duration=180;
+    COLORREF from=Dark,target=Dark;
+    double started=0;
+    bool initialized=false;
+    void Reset(COLORREF colour){from=target=colour;initialized=true;started=0;}
+    bool Running(double now) const {return from!=target && now-started<duration;}
+    COLORREF Sample(double now) const {
+        double t=std::clamp((now-started)/duration,0.,1.);
+        t=t*t*(3-2*t); // smooth departure and arrival, no long grey plateau
+        auto channel=[t](int a,int b){return int(std::lround(a+(b-a)*t));};
+        return RGB(channel(GetRValue(from),GetRValue(target)),channel(GetGValue(from),GetGValue(target)),channel(GetBValue(from),GetBValue(target)));
+    }
+    void Aim(COLORREF colour,COLORREF current,double now) {
+        if(!initialized)Reset(current);
+        if(colour==target)return;
+        from=Sample(now);target=colour;started=now;
+    }
+};
+}