Skip to content

Free, open-source 3D sculpting for Linux, macOS and Windows: dense meshes, remeshing, painting, built-in AI (image/text to 3D), Send to Unreal, game-ready LODs, Gaussian splats and OpenUSD.

Merge feat/cursor-look (Outlines setting) into feat/hover-pop; hover rings follow Outlines and Outline opacity (calm by default)

islandmeda7f3a567a7b7
diff --cc CHANGELOG.md
index cfeca806,56f504b9..fa28eb26
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -7,17 -7,24 +7,36 @@@ All notable changes to SculptForge are
## [Unreleased]
### Changed
+- Hover highlights that pop, in every look: buttons, menu items, shelf buttons and palette headers ease into an
+ accent-tinted fill with a crisp accent border and a brighter label in about 100 ms (Forge Terminal: the accent
+ border; Phosphor: an inverse-video glow; Blueprint: a cyan line glow; Classic: a subtle warm highlight), and
+ pressed is a touch darker. Brush, alpha, material and look tiles (shelves, pickers, Library) lift slightly with a
+ soft shadow and an accent glow ring, without moving anything; the active tile keeps its orange outline. Sliders
+ brighten, grow a knob and show their exact value. The keyboard focus gets the same ring. New **Preferences >
- Interface > Reduce motion**: colour changes only, no easing or lifting. Animations draw frames only while they run.
++ Interface > Reduce motion**: colour changes only, no easing or lifting. The rings follow **Outlines** (Off: the fill and label only; Subtle, the default: one faint line; On: the
++ look's full flavour) and **Outline opacity**. Animations draw frames only while they run.
+
+### Fixed
+- The enlarged brush or alpha thumbnail you point at in a picker is drawn over its neighbours again, not
+ under them (#86, thanks tristratos).
+ - Brush cursor (#88): the ring is a true circle in the surface's tangent plane (its normal averaged over the brush
+ area) instead of being pressed onto the mesh point by point, so it no longer wobbles or breaks up on bumpy
+ surfaces; symmetry and radial copies show as dots, not rings; the crosshair stays while the view turns, pans or
+ zooms. New Preferences > Cursor (Viewport cursor and Cursor follows surface moved there) with Hide ring while
+ stroking (off by default).
+ - Looks: new installs default to the new Neutral scheme (pure grey, the orange accent only), and the first-run
+ welcome offers three look cards (Neutral, Forge Terminal, ZBrush-style layout); Coming from now sets the keys and
+ the layout together. The Classic look's greys, the viewport gradient and the default background are now exactly
+ neutral (they had a slight blue cast). Existing installs keep their look.
+ - Forge Terminal, Phosphor and Blueprint: Preferences > Interface > Look > Outlines (Off / Subtle / On, default
+ Subtle) and Outline opacity (0-100%) (#98). The panel under the pointer no longer gets an accent border (at most a faint step, with Outlines On);
+ shelf thumbnails get a faint fill on hover instead of an accent outline.
+
+ ### Added
+ - A Strokes radial menu on J: the five stroke types on one ring (single ring, like every radial menu), and a
+ stroke.type.* action for each.
+ - Panels scroll with a left-drag on empty space or a middle-drag anywhere on them, for pens and small screens (#100).
+ - Viewport hints have Don't show again; Preferences > Hints shows, hides or restores them all.
## [0.10.8] - 2026-11-02
diff --cc docs/guide/whats-new.md
index 0bf9c238,7ba05208..61a9f1db
--- a/docs/guide/whats-new.md
+++ b/docs/guide/whats-new.md
@@@ -7,11 -7,20 +7,25 @@@ chapter opens by itself the first time
## Version 0.10.9
+- **Hover highlights that pop**: buttons, menus and shelves light up in your look's accent as you point at them,
+ tiles lift a little, sliders show their exact value, and the keyboard focus gets the same ring. Prefer less
+ movement? Turn on **Preferences > Interface > Reduce motion** ([Interface](interface.md)).
+- **Picker thumbnails on top**: the enlarged thumbnail you point at in a picker is no longer hidden under its
+ neighbours (#86).
+ - **A calmer brush cursor**: the ring is a true circle lying in the plane of the surface, so bumps no longer bend
+ or break it; symmetry copies show as dots instead of extra rings; the crosshair stays while you turn the view; and
+ **Preferences > Cursor > Hide ring while stroking** leaves only a dot while you sculpt (off by default) (#88).
+ - **Neutral grey by default**: new installs start in **Neutral** (grey panels, one orange accent), and the first
+ start offers three looks: Neutral, Forge Terminal and the ZBrush-style layout. **Classic** is now truly neutral
+ grey too. Your current look stays as it is. See [Looks and layouts](interface.md#looks-and-layouts).
+ - **Calmer panels**: **Preferences > Interface > Look > Outlines** (Off, Subtle, On) and **Outline opacity** for
+ Forge Terminal, Phosphor and Blueprint (#98). Subtle is the default, and the panel under the pointer no longer lights up.
+ - **Strokes ring on J**: hold <kbd>J</kbd>, flick toward Dots, Drag Stamp, Slide Stamp, Spray or Lazy Stroke, let
+ go. See [Radial menus](sculpting.md#radial-menus).
+ - **Drag to scroll panels**: on small screens and with a pen, drag empty space in a panel (or middle-drag anywhere
+ on it) to scroll it (#100).
+ - **Hints you can turn off**: every note over the 3D view has **Don't show again**, and **Preferences > Hints**
+ turns them on and off.
## Version 0.10.8
diff --cc src/app/Config.cpp
index ea262e9d,25c1f38f..0c1c9bbf
--- a/src/app/Config.cpp
+++ b/src/app/Config.cpp
@@@ -1003,7 -1090,7 +1092,8 @@@ void App::drawHelpConsoleUi()
ImGui::PopStyleVar(3);
}
watchLayoutChanges();
+ ui::DragScrollPanels(); // #100: pen and middle drags scroll panels (after every window)
+ ui::DrawHover(*this); // the hover and keyboard-focus rings, over every window
ui::DrawHelp(*this); // last: on top of everything
}
@@@ -1357,22 -1468,9 +1475,11 @@@ void App::drawLookSection()
const bool hovered = ImGui::IsItemHovered(), current = l.look == i;
const ImVec2 a = ImGui::GetItemRectMin(), b = ImGui::GetItemRectMax();
ImDrawList* dl = ImGui::GetWindowDrawList();
+ const ui::TileLift lift = ui::BeginTileLift(a, b, 0.0f);
- auto col = [](unsigned hex) { return theme::u32(theme::rgb(hex)); };
- // A miniature of the look: its wallpaper, a bar with its accent, two tiles, its name in its text colour.
- dl->AddRectFilled(a, b, col(pal.crust));
- const float g = 3.0f * s;
- dl->AddRectFilled(ImVec2(a.x + g, a.y + g), ImVec2(b.x - g, a.y + g + 8.0f * s), col(pal.mantle));
- dl->AddRectFilled(ImVec2(a.x + g + 2.0f * s, a.y + g + 2.0f * s), ImVec2(a.x + g + 16.0f * s, a.y + g + 6.0f * s), col(pal.accent));
- dl->AddRectFilled(ImVec2(a.x + g, a.y + 2.0f * g + 8.0f * s), ImVec2(b.x - g - 30.0f * s, b.y - g), col(pal.base));
- dl->AddRectFilled(ImVec2(b.x - g - 26.0f * s, a.y + 2.0f * g + 8.0f * s), ImVec2(b.x - g, b.y - g), col(pal.base));
- dl->AddRectFilled(ImVec2(b.x - g - 22.0f * s, b.y - g - 8.0f * s), ImVec2(b.x - g - 4.0f * s, b.y - g - 4.0f * s), col(pal.accent2));
- ImFont* f = i == int(looks::LookId::Classic) ? fontInterSmall_ : fontMonoSmall_;
- if (!f) f = ImGui::GetFont();
- dl->AddText(f, f->FontSize, ImVec2(a.x + g + 6.0f * s, b.y - g - f->FontSize - 3.0f * s), col(pal.text), looks::lookName(id));
+ config::drawLookMiniature(dl, a, b, pal, looks::lookName(id), i == int(looks::LookId::Classic) ? fontInterSmall_ : fontMonoSmall_, s);
dl->AddRect(a, b, theme::u32(current ? theme::accent : hovered ? theme::textDim : theme::tileBorder), 0.0f, 0,
current ? 2.0f * s : 1.0f * s);
+ ui::EndTileLift(lift, 0.0f);
ImGui::LogText("%s", looks::lookName(id));
ui::HelpText(looks::lookName(id), nullptr,
i == 0 ? "The original dark grey look with the orange accent."
diff --cc src/app/Shell.cpp
index c4bddef2,b51a4a2b..a354d182
--- a/src/app/Shell.cpp
+++ b/src/app/Shell.cpp
@@@ -2288,10 -2292,10 +2300,11 @@@ bool tileFrame(const char* id, ImVec2 s
const float capH = (font ? font->FontSize : 12.0f) + 4.0f * s;
pic0 = a;
pic1 = ImVec2(b.x, b.y - capH);
- dl->AddRectFilled(pic0, pic1, theme::u32(theme::tile), theme::rounding(4.0f * s));
- if (hovered) dl->AddRectFilled(pic0, pic1, theme::u32(theme::buttonHover, 0.45f), theme::rounding(4.0f * s)); // (a faint fill, no border)
- centredText(dl, font, ImVec2(a.x, b.y - capH), b, theme::u32(hovered ? theme::text : theme::textDim),
+ centredText(dl, font, ImVec2(a.x, b.y - capH), b, theme::u32(hovered ? theme::textHover : theme::textDim),
elide(font ? font : ImGui::GetFont(), caption, size.x).c_str());
+ lift = ui::BeginTileLift(pic0, pic1); // the picture lifts, the caption stays
+ dl->AddRectFilled(pic0, pic1, theme::u32(theme::tile), theme::rounding(4.0f * s));
++ if (hovered) dl->AddRectFilled(pic0, pic1, theme::u32(theme::buttonHover, 0.45f), theme::rounding(4.0f * s)); // (a faint fill)
ImGui::LogText("%s", caption.c_str());
return clicked;
}
diff --cc src/app/Theme.cpp
index 2149f883,2a5ab67d..a75ab593
--- a/src/app/Theme.cpp
+++ b/src/app/Theme.cpp
@@@ -110,20 -110,7 +110,20 @@@ ImVec4 mixc(const ImVec4& a, const ImVe
return ImVec4(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t, alpha);
}
+// Hover in every look: the accent tints the hover fills, a little in Classic (a warm highlight), more in the
- // terminal looks; pressed is a touch darker than hover (ui::DrawHover adds the ring).
++// terminal looks; pressed is a touch darker than hover (ui::DrawHover adds the ring, as strong as Outlines says).
+void tintHovers(looks::LookId id) {
+ const float k = id == looks::LookId::Classic ? 0.16f : id == looks::LookId::Phosphor ? 0.28f
+ : id == looks::LookId::Blueprint ? 0.24f : 0.22f;
+ buttonHover = mixc(buttonHover, accent, k);
+ buttonPressed = mixc(buttonHover, rgb(0x000000), 0.22f);
+ headerHover = mixc(headerHover, accent, k * 0.9f);
+ frameHover = mixc(frameHover, accent, k * 0.6f);
+ toggleOffHover = mixc(toggleOffHover, accent, k);
+ toggleOnHover = mixc(toggleOnHover, accent, k * 0.7f);
+}
+
- ImVec4 g_gradCentre(0.215f, 0.215f, 0.222f, 1.0f), g_gradEdge(0.106f, 0.106f, 0.114f, 1.0f);
+ ImVec4 g_gradCentre(0.217f, 0.217f, 0.217f, 1.0f), g_gradEdge(0.109f, 0.109f, 0.109f, 1.0f);
void syncUiColors() {
ui::color::accent = u32(accent);
@@@ -192,11 -179,10 +192,14 @@@ void applyLook(const LookSettings& sett
: looks::LookId::Classic;
look = LookStyle{};
look.id = int(id);
++ // (The hover rings follow Outlines in every look: Classic has no panel borders, but a calm hover all the same.)
++ look.outlines = std::clamp(settings.outlines, 0, 2);
++ look.outlineOpacity = std::clamp(settings.outlineOpacity, 0.0f, 1.0f);
if (id == looks::LookId::Classic) {
for (size_t i = 0; i < std::size(kTokens); ++i) *kTokens[i] = classic[i];
- g_gradCentre = ImVec4(0.215f, 0.215f, 0.222f, 1.0f);
- g_gradEdge = ImVec4(0.106f, 0.106f, 0.114f, 1.0f);
+ g_gradCentre = ImVec4(0.217f, 0.217f, 0.217f, 1.0f);
+ g_gradEdge = ImVec4(0.109f, 0.109f, 0.109f, 1.0f);
+ tintHovers(id);
applyStyle();
syncUiColors();
return;
@@@ -241,7 -227,14 +244,15 @@@
}
for (size_t i = 0; i < std::size(kTokens); ++i) *kTokens[i] = classic[i];
setTokens(palette, id);
+ // Outlines: on keeps the scheme's borders, subtle fades them most of the way into the panels, off hides them.
+ // The panel under the pointer never gets the accent: on lifts its border a faint step, the others not at all.
+ look.outlines = std::clamp(settings.outlines, 0, 2);
+ const ImVec4 strong = tileBorder;
+ // Outline opacity (#98) scales the border's step from the panel colour: 0 hides it, 1 is the setting's own.
+ const float opacity = std::clamp(settings.outlineOpacity, 0.0f, 1.0f);
+ tileBorder = look.outlines == 0 ? panelBg : mixc(panelBg, strong, (look.outlines == 1 ? 0.4f : 1.0f) * opacity);
+ focusBorder = look.outlines == 2 ? mixc(tileBorder, textDim, 0.35f * opacity) : tileBorder;
+ tintHovers(id);
applyStyle();
ImGuiStyle& s = ImGui::GetStyle();
s.WindowRounding = s.ChildRounding = s.PopupRounding = s.FrameRounding = s.GrabRounding = s.TabRounding = 0.0f;
diff --cc src/app/Theme.h
index cc3d4408,812adf67..ebb756fd
--- a/src/app/Theme.h
+++ b/src/app/Theme.h
@@@ -78,6 -78,7 +78,8 @@@ struct LookStyle
bool scanlines = false; // Phosphor's effects (off by default): scanlines and a glow, on the chrome only
bool glow = false;
bool upperHeaders = false; // palette headers in capitals
+ int outlines = 1; // tiled looks' panel borders: 0 off, 1 subtle (the default), 2 on (LookSettings)
++ float outlineOpacity = 1.0f; // Outline opacity (LookSettings), 0-1; the hover rings follow both
};
inline LookStyle look;
diff --cc src/app/Ui.cpp
index 9cbafdd2,85f91af3..ec03e82d
--- a/src/app/Ui.cpp
+++ b/src/app/Ui.cpp
@@@ -269,192 -239,6 +269,202 @@@ void Keycaps(const std::string& chord)
if (ImGui::GetCurrentContext()->LogEnabled) ImGui::LogText(" %s", chord.c_str());
}
+float HoverAmount(ImGuiID id, bool on) {
+ auto it = g_anims.find(id);
+ if (it == g_anims.end()) {
+ if (!on) return 0.0f;
+ it = g_anims.emplace(id, Anim{}).first;
+ }
+ Anim& a = it->second;
+ const int frame = ImGui::GetFrameCount();
+ if (a.frame != frame) {
+ a.frame = frame;
+ const float step = g_reduceMotion ? 1.0f : std::clamp(ImGui::GetIO().DeltaTime, 0.0f, 0.05f) / kHoverSeconds;
+ a.t = on ? std::min(1.0f, a.t + step) : std::max(0.0f, a.t - step);
+ }
+ if (a.t > 0.0f && a.t < 1.0f) g_animating = true;
+ const float t = easeOut(a.t);
+ if (!on && a.t <= 0.0f) g_anims.erase(it);
+ return t;
+}
+
+bool HoveredOrFocused(ImGuiID id) { return id && (ImGui::GetHoveredID() == id || focusedByKeyboard(id)); }
+
+void NoHoverRing(ImGuiID id) {
+ if (id) g_noRing.push_back(id);
+}
+
+bool HoverAnimating() { return g_animating || g_animatingLast; }
+bool ReduceMotion() { return g_reduceMotion; }
+int HoverRingsShown() { return g_ringsShown; }
+int HoverLiftsShown() { return g_liftsShown; }
+
+void NoteItem(ImGuiContext* ctx, ImGuiID id, const ImVec2& min, const ImVec2& max) {
+ if (!id || !ctx || !ctx->CurrentWindow) return;
+ if (g_seenFrame != ctx->FrameCount) {
+ g_seenFrame = ctx->FrameCount;
+ g_seen.clear();
+ g_noRing.clear();
+ }
+ bool want = id == ctx->HoveredIdPreviousFrame || id == ctx->HoveredId || id == ctx->NavId || id == ctx->ActiveId;
+ for (size_t i = 0; !want && i < g_rings.size(); ++i) want = g_rings[i] == id;
+ if (!want) return;
+ g_seen.push_back({id, ImRect(min, max), ctx->CurrentWindow->ClipRect, ctx->CurrentWindow, false});
+}
+
+void NoteItemLabel(ImGuiID id) {
+ for (auto it = g_seen.rbegin(); it != g_seen.rend(); ++it)
+ if (it->id == id) {
+ it->labelled = true;
+ return;
+ }
+}
+
+namespace {
+
+// The look's hover ring round `r` at strength t (0-1): a tinted fill and a crisp border in every look, plus its flavour.
+void drawRing(ImDrawList* dl, ImRect r, float t, float rounding, bool fill) {
+ const float s = uiScale(), px = std::max(1.0f, std::floor(s + 0.25f));
+ const ImVec4& ac = theme::accent;
+ auto rect = [&](float grow, const ImVec4& c, float alpha, float w) {
+ dl->AddRect(ImVec2(r.Min.x - grow, r.Min.y - grow), ImVec2(r.Max.x + grow, r.Max.y + grow), theme::u32(c, alpha * t),
+ rounding > 0.0f ? rounding + grow : 0.0f, 0, w);
+ };
+ const int look = theme::look.id;
++ // Outlines (Preferences > Interface > Look) sets how loud the ring is: Off none (the fill and label only), Subtle
++ // (the default) one faint line, On the look's full flavour; Outline opacity scales the lines.
++ const int outlines = theme::look.outlines;
++ const float op = theme::look.outlineOpacity;
+ if (fill) dl->AddRectFilled(r.Min, r.Max, theme::u32(ac, (look == 2 ? 0.16f : look == 0 ? 0.07f : 0.10f) * t), rounding);
+ // (Strokes sit half a stroke inside the rect, so the border is crisp and inside the item.)
+ r.Min.x += 0.5f * px, r.Min.y += 0.5f * px, r.Max.x -= 0.5f * px, r.Max.y -= 0.5f * px;
++ if (outlines == 0 || op <= 0.0f) return;
++ t *= op;
++ if (outlines == 1) {
++ rect(0.0f, look == 0 ? theme::accentHover : ac, 0.40f, px);
++ return;
++ }
+ switch (look) {
+ case 0: // Classic: a subtle warm highlight
+ rect(0.0f, theme::accentHover, 0.60f, px);
+ break;
+ case 2: // Phosphor: the inverse-video glow, light bleeding out of the item
+ rect(1.0f * px, ac, 0.34f, px);
+ rect(2.0f * px, ac, 0.16f, px);
+ rect(3.0f * px, ac, 0.07f, px);
+ rect(0.0f, ac, 1.0f, px);
+ break;
+ case 3: // Blueprint: a cyan line with a soft outer line, like a highlighted drawing stroke
+ rect(1.5f * px, ac, 0.28f, 2.0f * px);
+ rect(0.0f, ac, 1.0f, px);
+ break;
+ default: // Forge Terminal: the crisp accent border
+ rect(0.0f, ac, 1.0f, std::max(px, std::floor(1.5f * s)));
+ break;
+ }
+}
+
+} // namespace
+
+TileLift BeginTileLift(ImVec2 min, ImVec2 max, float rounding) {
+ TileLift l;
+ const ImGuiID id = ImGui::GetItemID();
+ const bool disabled = (ImGui::GetItemFlags() & ImGuiItemFlags_Disabled) != 0;
+ NoHoverRing(id);
+ l.dl = ImGui::GetWindowDrawList();
+ l.min = min, l.max = max;
+ l.t = disabled ? 0.0f : HoverAmount(id, ImGui::IsItemHovered() || focusedByKeyboard(id));
+ if (l.t > 0.0f && !g_reduceMotion) {
+ // A soft shadow under the lifted tile (drawn at its lifted size), then let the tile's own drawing out of the
+ // clip by the lift.
+ const float s = uiScale(), k = 0.025f * l.t;
+ const ImVec2 c((min.x + max.x) * 0.5f, (min.y + max.y) * 0.5f), h((max.x - min.x) * (0.5f + k), (max.y - min.y) * (0.5f + k));
+ for (int i = 3; i >= 1; --i) {
+ const float g = float(i) * 1.5f * s, dy = 2.5f * s * l.t;
+ l.dl->AddRectFilled(ImVec2(c.x - h.x - g, c.y - h.y - g + dy), ImVec2(c.x + h.x + g, c.y + h.y + g + dy),
+ IM_COL32(0, 0, 0, int(30.0f * l.t)), theme::rounding(rounding * s) + g);
+ }
+ const ImVec4 cr = l.dl->_CmdHeader.ClipRect;
+ const float m = std::max(h.x, h.y) * 0.06f + 1.0f;
+ l.dl->PushClipRect(ImVec2(std::max(cr.x - m, min.x - m), std::max(cr.y - m, min.y - m)),
+ ImVec2(std::min(cr.z + m, max.x + m), std::min(cr.w + m, max.y + m)), false);
+ l.clip = true;
+ }
+ l.vtx = l.dl->VtxBuffer.Size;
+ return l;
+}
+
+void EndTileLift(const TileLift& l, float rounding) {
+ if (!l.dl || l.t <= 0.0f) return;
+ ++g_liftsCounting;
+ const ImVec2 c((l.min.x + l.max.x) * 0.5f, (l.min.y + l.max.y) * 0.5f);
+ const float scale = g_reduceMotion ? 1.0f : 1.0f + 0.05f * l.t;
+ if (scale != 1.0f)
+ for (int i = l.vtx; i < l.dl->VtxBuffer.Size; ++i) {
+ ImVec2& p = l.dl->VtxBuffer[i].pos;
+ p = ImVec2(c.x + (p.x - c.x) * scale, c.y + (p.y - c.y) * scale);
+ }
+ const ImVec2 h((l.max.x - l.min.x) * 0.5f * scale, (l.max.y - l.min.y) * 0.5f * scale);
+ const float s = uiScale(), px = std::max(1.0f, std::floor(s + 0.25f));
+ // The glow ring just outside the tile (the active tile's orange outline stays inside it).
+ const ImRect r(ImVec2(c.x - h.x - px, c.y - h.y - px), ImVec2(c.x + h.x + px, c.y + h.y + px));
+ drawRing(l.dl, r, l.t, theme::rounding(rounding * s), false);
- if (theme::look.id != 2) // a soft second line: the glow (Phosphor's ring brings its own)
++ if (theme::look.id != 2 && theme::look.outlines == 2) // a soft second line: the glow (Phosphor's ring brings its own)
+ l.dl->AddRect(ImVec2(r.Min.x - 1.5f * px, r.Min.y - 1.5f * px), ImVec2(r.Max.x + 1.5f * px, r.Max.y + 1.5f * px),
- theme::u32(theme::accent, 0.22f * l.t), theme::rounding(rounding * s) + 1.5f * px, 0, 2.0f * px);
++ theme::u32(theme::accent, 0.22f * l.t * theme::look.outlineOpacity), theme::rounding(rounding * s) + 1.5f * px, 0, 2.0f * px);
+ if (l.clip) l.dl->PopClipRect();
+}
+
+void DrawHover(App& app) {
+ g_reduceMotion = app.uiPrefs().reduceMotion;
+ g_animatingLast = g_animating;
+ g_animating = false;
+ g_liftsShown = g_liftsCounting;
+ g_liftsCounting = 0;
+ g_ringsShown = 0;
+ const ImGuiContext& g = *GImGui;
+ if (g_seenFrame != g.FrameCount) g_seen.clear(), g_noRing.clear(); // no items this frame
+ const ImGuiID hovered = g.HoveredId, focused = g.NavCursorVisible && g.NavWindow ? g.NavId : 0;
+ const float fh = ImGui::GetFrameHeight();
+ auto find = [&](ImGuiID id) -> const Seen* {
+ if (!id || std::find(g_noRing.begin(), g_noRing.end(), id) != g_noRing.end()) return nullptr;
+ for (auto it = g_seen.rbegin(); it != g_seen.rend(); ++it)
+ if (it->id == id) {
+ // Only labelled widgets, and nothing as big as a view (the UV editor, the timeline's track).
+ if (!it->labelled || (it->bb.GetWidth() > 16.0f * fh && it->bb.GetHeight() > 4.0f * fh)) return nullptr;
+ return &*it;
+ }
+ return nullptr;
+ };
+ for (ImGuiID id : {hovered, focused})
+ if (find(id) && std::find(g_rings.begin(), g_rings.end(), id) == g_rings.end()) g_rings.push_back(id);
+ for (size_t i = 0; i < g_rings.size();) {
+ const ImGuiID id = g_rings[i];
+ const Seen* at = find(id);
+ const bool on = at && (id == hovered || id == focused);
+ const float t = HoverAmount(id, on);
+ if (!at || t <= 0.0f) { // gone (its window closed, or it draws its own hover now), or faded out
+ g_anims.erase(id);
+ g_rings.erase(g_rings.begin() + std::ptrdiff_t(i));
+ continue;
+ }
+ ImDrawList* dl = at->window->DrawList;
+ const float m = 4.0f * uiScale();
+ ImRect clip(at->clip.Min.x - m, at->clip.Min.y - m, at->clip.Max.x + m, at->clip.Max.y + m);
+ clip.ClipWith(at->window->OuterRectClipped);
+ clip.ClipWith(ImRect(ImVec2(0, 0), g.IO.DisplaySize));
+ dl->PushClipRect(clip.Min, clip.Max, false);
+ drawRing(dl, at->bb, t, ImGui::GetStyle().FrameRounding, id != g.ActiveId);
+ dl->PopClipRect();
+ ++g_ringsShown;
+ ++i;
+ }
+ // Forget items that stopped animating long ago (a window closed under the pointer).
+ const int frame = ImGui::GetFrameCount();
+ for (auto it = g_anims.begin(); it != g_anims.end();)
+ it = frame - it->second.frame > 120 ? g_anims.erase(it) : std::next(it);
+}
+
void DelayedTooltip(const char* text) {
if (!text || !*text || CtrlHeld()) return;
if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) ImGui::SetTooltip("%s", tr(text));
@@@ -492,22 -275,6 +502,22 @@@ bool ActionButton(App& app, const char
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, mode ? theme::accentHover : theme::toggleOnHover);
ImGui::PushStyleColor(ImGuiCol_Text, mode ? theme::textOnAccent : theme::textBright);
colors = 3;
+ } else if (look != Look::Tile && enabled) {
+ // Hover eases the fill towards the accent-tinted hover and brightens the label (Phosphor: inverse video, the
+ // accent fill with a dark label); pressed is darker. (Hovered as of the last frame: the item isn't drawn yet.)
+ const float h = HoverAmount(ImGui::GetID(itemLabel.c_str()), HoveredOrFocused(ImGui::GetID(itemLabel.c_str())));
+ if (h > 0.0f) {
+ auto mix = [h](const ImVec4& a, const ImVec4& b) {
+ return ImVec4(a.x + (b.x - a.x) * h, a.y + (b.y - a.y) * h, a.z + (b.z - a.z) * h, a.w + (b.w - a.w) * h);
+ };
- const bool inverse = theme::look.id == 2;
++ const bool inverse = theme::look.id == 2 && theme::look.outlines == 2; // (loud: Outlines On only)
+ const ImVec4 fill = mix(ImGui::GetStyleColorVec4(ImGuiCol_Button), inverse ? theme::accent : theme::buttonHover);
+ const ImVec4 ink = mix(ImGui::GetStyleColorVec4(ImGuiCol_Text), inverse ? theme::textOnAccent : theme::textHover);
+ ImGui::PushStyleColor(ImGuiCol_Button, fill);
+ ImGui::PushStyleColor(ImGuiCol_ButtonHovered, fill);
+ ImGui::PushStyleColor(ImGuiCol_Text, ink);
+ colors = 3;
+ }
}
ImGui::BeginDisabled(!enabled);
bool clicked = false;
diff --cc src/app/UiTest.cpp
index 306a113d,0e666678..854ce73b
--- a/src/app/UiTest.cpp
+++ b/src/app/UiTest.cpp
@@@ -462,10 -466,10 +466,13 @@@ double Demo::query(const std::string& n
if (name == "quickmenu_open") return app_.quickMenu_.open ? 1.0 : 0.0;
if (name == "right_click_menu") return app_.uiPrefs_.rightClickQuickMenu ? 1.0 : 0.0;
if (name == "space_camera") return app_.uiPrefs_.spaceCamera ? 1.0 : 0.0;
+ if (name == "look_outline_opacity") return double(std::lround(app_.uiPrefs_.look.outlineOpacity * 100.0f)); // percent
+ if (name == "look_outlines") return double(app_.uiPrefs_.look.outlines); // 0 off, 1 subtle, 2 on
+ if (name == "look_neutral") return app_.uiPrefs_.look.scheme == "neutral" ? 1.0 : 0.0; // Forge Terminal's Neutral colours
if (name == "look") return double(app_.uiPrefs_.look.look); // 0 Classic, 1 Forge Terminal, 2 Phosphor, 3 Blueprint
+ if (name == "hover_rings") return double(ui::HoverRingsShown()); // hover and focus rings drawn last frame
+ if (name == "hover_lifts") return double(ui::HoverLiftsShown()); // tiles lifted last frame
+ if (name == "reduce_motion") return app_.uiPrefs_.reduceMotion ? 1.0 : 0.0;
if (name == "shell_layout") return double(app_.uiPrefs_.shellLayout); // 0 ZBrush-style, 1 SculptForge
if (name == "air_strokes") return app_.uiPrefs_.airStrokes ? 1.0 : 0.0;
if (name == "space_held") return app_.spaceHeld_ ? 1.0 : 0.0;
diff --cc tests/ui/hover_pop.sfui
index 5ba00c76,00000000..bcc467c5
mode 100644,000000..100644
--- a/tests/ui/hover_pop.sfui
+++ b/tests/ui/hover_pop.sfui
@@@ -1,65 -1,0 +1,79 @@@
+# Hover highlights (0.10.8): in every look the hovered button or menu gets the look's ring, a tile lifts and draws
- # its own glow instead, and Preferences > Interface > Reduce motion keeps the highlight (colour only).
++# its own glow instead; Outlines (Off / Subtle, the default / On) sets how loud the ring is, and Preferences > Interface >
++# Reduce motion keeps the highlight (colour only).
+run new_sphere subdivisions=3
+expect_value reduce_motion == 0
+
+run ui_look look=forge scheme=tokyo_night
+wait 0.2
+hover "Clay##brush.clay"
+wait 0.3
+expect_value hover_lifts == 1
+expect_value hover_rings == 0 # the tile's glow, not a second ring
+shot forge_tile
+hover "File##menu.file"
+wait 0.3
+expect_value hover_rings == 1
+expect_value hover_lifts == 0
- shot forge_menu
++shot forge_menu # Outlines Subtle (the default): one faint line
++run ui_look look=forge outlines=on
++wait 0.2
++hover "Edit##menu.edit"
++wait 0.3
++expect_value hover_rings == 1
++shot forge_menu_outlines_on
++run ui_look look=forge outlines=off
++wait 0.2
++hover "File##menu.file"
++wait 0.3
++expect_value hover_rings == 1 # the fill and label only, no line
++shot forge_menu_outlines_off
++run ui_look look=forge outlines=subtle
+
+run ui_look look=phosphor
+wait 0.2
+hover "Clay##brush.clay"
+wait 0.3
+expect_value hover_lifts == 1
+shot phosphor_tile
+hover "File##menu.file"
+wait 0.3
+expect_value hover_rings == 1
+shot phosphor_menu
+
+run ui_look look=blueprint
+wait 0.2
+hover "Clay##brush.clay"
+wait 0.3
+expect_value hover_lifts == 1
+shot blueprint_tile
+hover "File##menu.file"
+wait 0.3
+expect_value hover_rings == 1
+shot blueprint_menu
+
+run ui_look look=classic
+wait 0.2
+hover "Clay##brush.clay"
+wait 0.3
+expect_value hover_lifts == 1
+shot classic_tile
+hover "File##menu.file"
+wait 0.3
+expect_value hover_rings == 1
+shot classic_menu
+
+# Reduce motion: the ring and the tile's glow stay, only the motion goes.
+click "Edit##menu.edit"
+click "Preferences##section.preferences"
+click "Interface##preferences.interface"
+click "Reduce motion"
+expect_value reduce_motion == 1
+key escape
+hover "Clay##brush.clay"
+wait 0.2
+expect_value hover_lifts == 1
+shot classic_tile_reduce_motion
+hover "File##menu.file"
+wait 0.2
+expect_value hover_rings == 1