Unified origin #2149

xarvic · 2022-03-08T20:28:47Z

This PR removes the viewport_offset property of WidgetPod and changes the ClipBox implementation to use WidgetPod::set_origin instead. This will fix incorrect hot state when scrolling.

TODOs:

find a way to merge WidgetPod::set_origin and WidgetPod::set_origin_dyn
decide when hot state should change. I think the current implementation, which is doing it during layout is wrong, since we don't know the new origin in layout.
change TextBox implementation to use scroll_to_view and LifeCycle::ViewContextChanged instead of manually managing its Scroll widget

jpochyla · 2022-08-16T13:52:44Z

Hi @xarvic, do you think this is ready to be merged?

xarvic · 2022-08-18T12:03:54Z

I am still waiting for awnser, how to make WidgetPod::set_origin callable from multiple contexts. TextBox for an example updates its scroll position when it recieves LifeCycle::FocusChanged. Which would otherwise be imposible.
set_viewportoffset solved this by requiering no context at all but this leads to a buggy hot state.
If we could merge #1611, doing this should be straitforward.

xarvic · 2022-08-18T12:04:33Z

Apart from that the PR is ready for review.

jpochyla · 2022-08-19T07:52:02Z

I think #1611 was missing a use-case inside Druid, and this is a compelling one!

xarvic · 2022-08-25T09:09:37Z

@jpochyla the PR is now ready for review.

liias · 2022-09-20T12:59:02Z

FWIW: I tested this on macOS and this fixes the incorrect hot state while scrolling.

- add set_layout_dyn - changed clipbox implementation

- removed LifeCycle::ParentWindowOrigin - moved HotState handling from layout to LifeCycle::ViewStateChanged

rename CommandCtx to ChangeCtx

xStrom

Thanks for taking this on and sorry for letting it sit so long!

Given that this changes quite a bit of code it's going to take several rounds of review. I'm going to start off with a simple surface level review of small stuff that stuck out as I went over the changes.

Next I will dig deeper to understand what is even going on here. 😄

CHANGELOG.md

druid/src/contexts.rs

druid/src/event.rs

druid/src/widget/clip_box.rs

druid/src/widget/scroll.rs

xStrom

Thanks for investing your time into making the adjustments. I have reviewed the latest commit and have a few more minor notes.

I've also been playing around with the code a bit, but a more thorough review of the substance here isn't ready yet.

druid/src/contexts.rs

druid/src/core.rs

druid/src/event.rs

druid/src/core.rs

xStrom

Okay, here's my first pass on the code. One interesting thing is that it's looking like there's increasingly fewer reasons to have the context trait changes. We'll see about that, for now can just look over the stuff I commented in this batch.

druid/src/event.rs

druid/src/window.rs

druid/src/contexts.rs

druid/src/core.rs

- removed data and ctx from set_origin

druid/src/window.rs

CHANGELOG.md

druid/src/window.rs

- fixed window.rs

added comments

druid/src/window.rs

xStrom

Thanks for your continued effort on this! I think this is ready for merge.

xarvic · 2022-12-13T10:26:19Z

And thank you for the thorough review :)

jpochyla · 2022-12-14T10:55:49Z

Thanks a lot Kaur!

xarvic force-pushed the unified_origin branch 2 times, most recently from 72903f2 to 61d80f8 Compare July 30, 2022 07:33

xarvic marked this pull request as ready for review July 30, 2022 12:11

xarvic linked an issue Jul 30, 2022 that may be closed by this pull request

When scrolling a list, button hot state sometimes gets stuck #2181

Closed

xarvic force-pushed the unified_origin branch 2 times, most recently from 8cc0bd2 to 96be87f Compare August 25, 2022 08:55

xarvic force-pushed the unified_origin branch from 2e86495 to f1a80a8 Compare November 20, 2022 14:39

Christoph and others added 12 commits November 28, 2022 21:55

quicksafe

c279eb1

- remove WidgetPod::viewport_offset and Event::with_scroll_offset

76d117f

- add set_layout_dyn - changed clipbox implementation

- created LifeCycle::ViewStateChanged

985cb3b

- removed LifeCycle::ParentWindowOrigin - moved HotState handling from layout to LifeCycle::ViewStateChanged

fixed errors

302ec4d

reformat

1236000

Added a modified version of context_traits (linebender#1611).

362c7ac

reformat

9027155

update z-stack for unified origin

fb0825b

reformat

26f0831

fix docs & clippy lints

4c11d63

remove AnyCtx

f63011a

rename CommandCtx to ChangeCtx

update CHANGELOG.md

7e630ec

xarvic force-pushed the unified_origin branch from b464b34 to 7e630ec Compare November 28, 2022 20:56

xStrom reviewed Dec 3, 2022

View reviewed changes

xStrom added architecture changes the architecture, usually breaking S-waiting-on-author waits for changes from the submitter labels Dec 3, 2022

xStrom reviewed Dec 4, 2022

View reviewed changes

druid/src/contexts.rs Outdated Show resolved Hide resolved

druid/src/core.rs Outdated Show resolved Hide resolved

druid/src/core.rs Show resolved Hide resolved

druid/src/event.rs Outdated Show resolved Hide resolved

druid/src/event.rs Outdated Show resolved Hide resolved

xarvic force-pushed the unified_origin branch from 4fa90d2 to 92d2d1a Compare December 4, 2022 16:12

fixed doc comments

702db96

xarvic force-pushed the unified_origin branch from 92d2d1a to 702db96 Compare December 6, 2022 14:49

xarvic requested a review from xStrom December 6, 2022 14:50

xStrom reviewed Dec 7, 2022

View reviewed changes

druid/src/core.rs Outdated Show resolved Hide resolved

xStrom reviewed Dec 7, 2022

View reviewed changes

- fixed doc comments

cc0ed48

- removed data and ctx from set_origin

xStrom reviewed Dec 10, 2022

View reviewed changes

druid/src/window.rs Outdated Show resolved Hide resolved

CHANGELOG.md Show resolved Hide resolved

druid/src/window.rs Outdated Show resolved Hide resolved

xarvic added 3 commits December 10, 2022 19:46

- updated CHANGELOG.md

69d5500

- fixed window.rs

fixed examples

4f7b198

removed lifetimes

12c1e59

added comments

xStrom reviewed Dec 11, 2022

View reviewed changes

druid/src/window.rs Show resolved Hide resolved

xarvic added 2 commits December 12, 2022 15:30

update window_origin docs

86c213e

reformat

a3beca5

xStrom added S-needs-review waits for review and removed S-waiting-on-author waits for changes from the submitter labels Dec 12, 2022

xStrom approved these changes Dec 12, 2022

View reviewed changes

xStrom removed the S-needs-review waits for review label Dec 12, 2022

xarvic merged commit 0214404 into linebender:master Dec 13, 2022

This was referenced Jan 20, 2023

Widget hover incorrect after scrolling with mousewheel #1507

Closed

Remove set_layout_rect and fix deprecation declarations. #2340

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unified origin #2149

Unified origin #2149

xarvic commented Mar 8, 2022 •

edited

Loading

jpochyla commented Aug 16, 2022

xarvic commented Aug 18, 2022 •

edited

Loading

xarvic commented Aug 18, 2022

jpochyla commented Aug 19, 2022

xarvic commented Aug 25, 2022

liias commented Sep 20, 2022

xStrom left a comment

xStrom left a comment

xStrom left a comment

xStrom left a comment

xarvic commented Dec 13, 2022

jpochyla commented Dec 14, 2022

Unified origin #2149

Unified origin #2149

Conversation

xarvic commented Mar 8, 2022 • edited Loading

jpochyla commented Aug 16, 2022

xarvic commented Aug 18, 2022 • edited Loading

xarvic commented Aug 18, 2022

jpochyla commented Aug 19, 2022

xarvic commented Aug 25, 2022

liias commented Sep 20, 2022

xStrom left a comment

Choose a reason for hiding this comment

xStrom left a comment

Choose a reason for hiding this comment

xStrom left a comment

Choose a reason for hiding this comment

xStrom left a comment

Choose a reason for hiding this comment

xarvic commented Dec 13, 2022

jpochyla commented Dec 14, 2022

xarvic commented Mar 8, 2022 •

edited

Loading

xarvic commented Aug 18, 2022 •

edited

Loading