Skip to content

Iced rebase#2154

Merged
wash2 merged 9 commits intomasterfrom
iced-rebase
Mar 13, 2026
Merged

Iced rebase#2154
wash2 merged 9 commits intomasterfrom
iced-rebase

Conversation

@wash2
Copy link
Contributor

@wash2 wash2 commented Mar 5, 2026

  • I have disclosed use of any AI generated code in my commit messages.
    • If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR.
    • In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment.
  • I understand these changes in full and will be able to respond to review comments.
  • My change is accurately described in the commit message.
  • My contribution is tested and working as described.
  • I have read the Developer Certificate of Origin and certify my contribution under its conditions.

@wash2 wash2 requested review from a team March 5, 2026 00:21
Copy link
Member

@Drakulix Drakulix left a comment

Choose a reason for hiding this comment

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

Looks good code-wise, still need to test the various UI-elements in cosmic-comp and their functionality.

Copy link
Member

@Drakulix Drakulix left a comment

Choose a reason for hiding this comment

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

So unfortuntely I noticed a couple of problems testing this:

  • Resize indicator: Works (Rendered below outline, but that is a bug also present on master)
  • Stacking indicator: Works
  • Swapping indicator: Works
  • Window-menu: Works, including submenus
  • Zoom menu: Works (..when enabled 🤦‍♀️)
  • Window SSD Header Bars: Fixed Right click doesn't work / bring up window menu
  • Stacks:
    • Fixed Right-click only works on the active tab. Not on inactive tabs, nor on the areas left and right to bring up the extended menu.
    • Fixed, ellipses now. Tab text doesn't fade out anymore on overflow
    • Fixed If the window is inactive, only the text is highlighted of the active tab, not the area below the "X"
    • When selecting the whole tab with Super+U, below the first pill/tab separator is the indicator color, which looks odd
    • Can't reproduce anymore Re-draws don't seem to be triggered correctly. E.g. switching the tab with the keyboard or spawning a new terminal doesn't always complete the animation. Moving the mouse fixes it.

@hojjatabdollahi
Copy link
Contributor

re "Tab text doesn't fade out anymore on overflow" I think we can just delete tab_text.rs. No need to port it to the new libcosmic. #2131

Since this PR already updates libcosmic, the SSDs are now correctly ellipsizing. We just need to update the tab text to use a normal text widget. If you want I can create a PR against this PR to migrate tab_text.

@wash2
Copy link
Contributor Author

wash2 commented Mar 10, 2026

If you want I can create a PR against this PR to migrate tab_text.

Sure that would be good, thanks

@wash2
Copy link
Contributor Author

wash2 commented Mar 10, 2026

Zoom menu: Doesn't show up

The zoom menu shows up when I test it. Just to double check, but are you sure the magnifier overlay was enabled in settings when you tested it?

When selecting the whole tab with Super+U, below the first pill/tab separator is the indicator color, which looks odd

It appears gray to me, but maybe I misunderstood the element that you are talking about. There is a thin strip at the bottom of the stack header that is the indicator color.

Re-draws don't seem to be triggered correctly. E.g. switching the tab with the keyboard or spawning a new terminal doesn't always complete the animation. Moving the mouse fixes it.

I'll have to do more testing for this but I also haven't able to replicate this yet

I'm working on a fix for the window menus.

@wash2
Copy link
Contributor Author

wash2 commented Mar 10, 2026

pop-os/libcosmic#1162 should fix the window menu issue

@wash2
Copy link
Contributor Author

wash2 commented Mar 10, 2026

Right-click only works on the active tab. Not on inactive tabs,

This doesn't seem to be a regression, but I am working on a fix for it.

nor on the areas left and right to bring up the extended menu.

This seems to have been fixed by the window menu fix

Re-draws don't seem to be triggered correctly. E.g. switching the tab with the keyboard or spawning a new terminal doesn't always complete the animation. Moving the mouse fixes it.

I'm seeing this now with some animations, but checking against the master branch, it also doesn't seem to be a regression.

@hojjatabdollahi
Copy link
Contributor

hojjatabdollahi commented Mar 10, 2026

Clicking on SSD starts a drag. You have to then click again to drop the window.

You can see in this video cosmic-files window works correctly (drag when I hold mouse 1 down), but just clicking on the foot terminal window (SSD) starts a drag (I tested this with your latest fix pop-os/libcosmic#1162).

recording-2026-03-10_17-10-31.mp4

@Drakulix
Copy link
Member

It appears gray to me, but maybe I misunderstood the element that you are talking about. There is a thin strip at the bottom of the stack header that is the indicator color.

I mean the pill left of the icon/first tab.

Screenshot_2026-03-11_17-30-09

Everything else seems to solved! :)

@wash2
Copy link
Contributor Author

wash2 commented Mar 11, 2026

I mean the pill left of the icon/first tab.

@Drakulix I'm not sure. It looks the same on this branch as on the master branch to me :/

master:
Screenshot_2026-03-11_13-47-50

iced-rebase:
Screenshot_2026-03-11_13-45-14

@Drakulix
Copy link
Member

I mean the pill left of the icon/first tab.

@Drakulix I'm not sure. It looks the same on this branch as on the master branch to me :/

Oh sorry, then this is broken on master as well. My bad, I should've checked.

Imo the grey pill should also be on the white background in your screenshot. But since that is no regression, you don't need to worry about that.

@hojjatabdollahi
Copy link
Contributor

The issue with the drag on click is fixed, but I have a different issue.

If you double click on the SSD to maximize and then double click on the SSD to restore the window, it restores correctly, but then if you move the cursor it starts resizing the window. If you click it stops resizing the window, but when you move the cursor over the SSD it grabs it and starts dragging the window and you need to click again for it to drop the window.

Copy link
Member

@Drakulix Drakulix left a comment

Choose a reason for hiding this comment

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

Looks good now! Both code-wise and from any bugs I could find. They all seem to be resolved or at least not regressed 🎉

@hojjatabdollahi
Copy link
Contributor

hojjatabdollahi commented Mar 12, 2026

I think the "clicking on SSD starts a drag" has returned.

Also rightclick on SSD doesn't open the context menu anymore.

@wash2
Copy link
Contributor Author

wash2 commented Mar 12, 2026

I think the "clicking on SSD starts a drag" has returned.

Also rightclick on SSD doesn't open the context menu anymore.

Are you sure you don't have an older version of this PR? I rebuilt and installed just now and can't seem to replicate these issues anymore.

@hojjatabdollahi
Copy link
Contributor

Yeah, the force push had messed my branch, I can't replicate it on a clean build either. Sorry about that.

@wash2 wash2 requested review from a team and removed request for a team March 13, 2026 16:14
@garrettjwilke
Copy link

on a laptop in cosmic-greeter login screen, it shows the battery status icon but doesn't match the rest of the cosmic themed icons:

icon

the good thing about this is that it updates the charging/discharging status immediately. the previous version of cosmic-greeter did not correctly update the battery charging status.

@Drakulix
Copy link
Member

on a laptop in cosmic-greeter login screen, it shows the battery status icon but doesn't match the rest of the cosmic themed icons:

[IMAGE]

the good thing about this is that it updates the charging/discharging status immediately. the previous version of cosmic-greeter did not correctly update the battery charging status.

That is not related to cosmic-comp.

@garrettjwilke
Copy link

on a laptop in cosmic-greeter login screen, it shows the battery status icon but doesn't match the rest of the cosmic themed icons:
[IMAGE]
the good thing about this is that it updates the charging/discharging status immediately. the previous version of cosmic-greeter did not correctly update the battery charging status.

That is not related to cosmic-comp.

ahh i'm sorry...i have a few tabs open...i should've paid attention to where i was posting :)

@wash2 wash2 merged commit b28a435 into master Mar 13, 2026
10 of 12 checks passed
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.

5 participants