Skip to content

Show rogue and druid icons next to combo points#88

Merged
argium merged 18 commits into
mainfrom
copilot/add-combo-points-icon
May 19, 2026
Merged

Show rogue and druid icons next to combo points#88
argium merged 18 commits into
mainfrom
copilot/add-combo-points-icon

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 6, 2026

Show rogue and druid icons next to combo points.

@argium argium marked this pull request as ready for review April 6, 2026 22:56
Copilot AI review requested due to automatic review settings April 6, 2026 22:56
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 6, 2026

Test Results

890 tests  ±0   890 ✅ ±0   2s ⏱️ -1s
  5 suites ±0     0 💤 ±0 
  5 files   ±0     0 ❌ ±0 

Results for commit bcbcd53. ± Comparison against base commit 97fdd38.

This pull request removes 29 and adds 29 tests. Note that renamed tests count towards both.
Tests/UI.ResourceBarOptions_spec_lua:106 ‑ ResourceBarOptions getters/setters/defaults border.thickness getter returns profile value
Tests/UI.ResourceBarOptions_spec_lua:109 ‑ ResourceBarOptions getters/setters/defaults border.thickness setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:117 ‑ ResourceBarOptions getters/setters/defaults overrideFont getter returns profile value
Tests/UI.ResourceBarOptions_spec_lua:120 ‑ ResourceBarOptions getters/setters/defaults overrideFont setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:128 ‑ ResourceBarOptions getters/setters/defaults colors all non-secret resource type color settings exist
Tests/UI.ResourceBarOptions_spec_lua:150 ‑ ResourceBarOptions getters/setters/defaults colors souls color getter returns hex string
Tests/UI.ResourceBarOptions_spec_lua:154 ‑ ResourceBarOptions getters/setters/defaults colors ComboPoints color setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:158 ‑ ResourceBarOptions getters/setters/defaults colors prefixes each resource label with its class icon and color
Tests/UI.ResourceBarOptions_spec_lua:179 ‑ ResourceBarOptions getters/setters/defaults class gating registers settings for non-DK class
Tests/UI.ResourceBarOptions_spec_lua:186 ‑ ResourceBarOptions getters/setters/defaults maxColorsEnabled icicles toggle setting exists
…
Tests/UI.ResourceBarOptions_spec_lua:105 ‑ ResourceBarOptions getters/setters/defaults border.enabled getter returns profile value
Tests/UI.ResourceBarOptions_spec_lua:108 ‑ ResourceBarOptions getters/setters/defaults border.enabled setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:115 ‑ ResourceBarOptions getters/setters/defaults border.thickness getter returns profile value
Tests/UI.ResourceBarOptions_spec_lua:118 ‑ ResourceBarOptions getters/setters/defaults border.thickness setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:126 ‑ ResourceBarOptions getters/setters/defaults overrideFont getter returns profile value
Tests/UI.ResourceBarOptions_spec_lua:129 ‑ ResourceBarOptions getters/setters/defaults overrideFont setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:137 ‑ ResourceBarOptions getters/setters/defaults colors all non-secret resource type color settings exist
Tests/UI.ResourceBarOptions_spec_lua:159 ‑ ResourceBarOptions getters/setters/defaults colors souls color getter returns hex string
Tests/UI.ResourceBarOptions_spec_lua:163 ‑ ResourceBarOptions getters/setters/defaults colors ComboPoints color setter writes to profile
Tests/UI.ResourceBarOptions_spec_lua:167 ‑ ResourceBarOptions getters/setters/defaults colors prefixes each resource label with its class icon and color
…

♻️ This comment has been updated with latest results.

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the Resource Bar options UI label formatting so resource rows use a consistent, right-aligned icon column, including dual-class icon support for shared resources like Combo Points.

Changes:

  • Introduce a fixed two-slot icon prefix for Resource Bar option row labels (padding single-icon rows with an invisible slot).
  • Render both Druid and Rogue class icons for the Combo Points resource while keeping Rogue-based label coloring.
  • Update Resource Bar options specs and add an architecture note documenting the fixed two-icon prefix behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File Description
UI/ResourceBarOptions.lua Adds fixed-width icon prefix generation and dual-icon Combo Points labeling.
Tests/UI/ResourceBarOptions_spec.lua Updates expectations to match the new fixed two-slot icon prefix and Combo Points dual icons.
ARCHITECTURE.md Documents the fixed two-icon prefix behavior in the Options UI flow.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread UI/ResourceBarOptions.lua Outdated
Comment thread UI/ResourceBarOptions.lua Outdated
Comment thread UI/ResourceBarOptions.lua Outdated
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8c281ce410

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread UI/ResourceBarOptions.lua Outdated
@argium
Copy link
Copy Markdown
Owner

argium commented Apr 7, 2026

@codex resolve all PR comments one way or another.

@chatgpt-codex-connector
Copy link
Copy Markdown

Summary

  • Updated EMPTY_RESOURCE_ICON to use RESOURCE_ICON_SIZE dynamically and made the spacer explicitly transparent (alpha 0) so padding remains visually empty while staying size-synced with class icons. UI/ResourceBarOptions.luaL9-L15
  • Hardened fixed-width icon prefix construction in createResourceColorName by clamping visible icons to RESOURCE_ICON_SLOTS, clamping padding to non-negative, and rendering only the rightmost icon slots when more classes are provided. UI/ResourceBarOptions.luaL21-L34
  • Updated the commented Arcane Charges example to match the new createResourceColorName(colorClassName, label, iconClasses) signature, preventing future uncomment/runtime breakage. UI/ResourceBarOptions.luaL56-L60
  • Updated the Resource Bar options spec’s expected spacer token to match the new transparent spacer escape sequence. Tests/UI/ResourceBarOptions_spec.luaL11
  • Committed these follow-up fixes as 3378554 and created a new follow-up PR via the make_pr tool.

Testing

  • ⚠️ busted Tests (failed: busted is not installed in this environment)
  • ⚠️ luacheck . -q (failed: luacheck is not installed in this environment)

View task →

…nts-icon

# Conflicts:
#	ARCHITECTURE.md
#	Tests/UI/ResourceBarOptions_spec.lua

Co-authored-by: argium <15852038+argium@users.noreply.github.com>
Copilot finished work on behalf of argium May 17, 2026 23:45
Copilot AI and others added 7 commits May 19, 2026 18:03
…ars are hidden (#100)

Remove gap between buff bars and external defensives when some buff bars
are hidden. Hidden bars still reserved space in the viewer leading to a
visible gap.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: argium <15852038+argium@users.noreply.github.com>
ExtraIcons could repeatedly clear and reapply the same anchors while
laying out its appended cooldown icons, which made the flicker-sensitive
layout path harder to keep stable.
Update the background texture more frequently.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: argium <15852038+argium@users.noreply.github.com>
@argium argium changed the title Align Resource Bar settings icons and add Combo Points dual-class icons Show rogue and druid icons next to combo points. May 19, 2026
@argium argium changed the title Show rogue and druid icons next to combo points. Show rogue and druid icons next to combo points May 19, 2026
@argium argium merged commit 8e0eae9 into main May 19, 2026
2 checks passed
@argium argium deleted the copilot/add-combo-points-icon branch May 19, 2026 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants