-
Notifications
You must be signed in to change notification settings - Fork 182
Design improvement for scaling win32 widgets #62 #2483
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Design improvement for scaling win32 widgets #62 #2483
Conversation
Test Results 546 files ±0 546 suites ±0 34m 43s ⏱️ + 2m 27s For more details on these failures, see this check. Results for commit 70e8d3f. ± Comparison against base commit 508ad4a. ♻️ This comment has been updated with latest results. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am a bit confused by this change, as it introduces a mixture of event processing and direct method calls for DPI change processing. I expected the following order of changes according to what we have discussed:
- Replace
CommonWidgetsDPIChangeHandler
: use listeners instead - Replace
DPIZoomChangeRegistry
: make direct calls ofhandleDPIChange
for the native controls instead - Replace direct
handleDPIChange
calls: use listeners instead - Make the listener calls asynchronous (may be combined with the previous step)
This change seems to be a mixture of the first three. Can we please split that up and make the changes in a more incremental, comprehensive way?
for (TreeItem item : treeItem.getItems()) { | ||
DPIZoomChangeRegistry.applyChange(item, newZoom, scalingFactor); | ||
for (TreeItem item : getItems()) { | ||
item.notifyListeners(SWT.ZoomChanged, event); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be a directcall to handleDPIChange
for now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm alright let me think of an order.
@@ -191,6 +190,14 @@ public Widget (Widget parent, int style) { | |||
reskinWidget (); | |||
notifyCreationTracker(); | |||
this.setData(DATA_NATIVE_ZOOM, this.nativeZoom); | |||
registerDPIChangeListener(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this PR, we stick to the synchronous processing of the event via direct methods calls, so no need to aready add this listener, right?
private void handleCComboDPIChange(Event event) { | ||
updateAndRefreshChildren(childWidget -> { | ||
childWidget.notifyListeners(SWT.ZoomChanged, event); | ||
}); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This intermediate method can be removed by directly making the notifications in the update method.
addListener(SWT.ZoomChanged, event -> { | ||
handleCComboDPIChange(event); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addListener(SWT.ZoomChanged, event -> { | |
handleCComboDPIChange(event); | |
}); | |
addListener(SWT.ZoomChanged, this::handleCComboDPIChange); |
@@ -2026,19 +2029,24 @@ public boolean traverse(int event){ | |||
return super.traverse(event); | |||
} | |||
|
|||
private void handleCComboDPIChange(Event event) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private void handleCComboDPIChange(Event event) { | |
private void handleDPIChange(Event event) { |
styledText.setCaretLocations(); | ||
|
||
caretSet.stream().filter(Objects::nonNull).forEach(caretToRefresh -> { | ||
((Caret) caretToRefresh).notifyListeners(SWT.ZoomChanged, event); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The set is already types as Caret
, so why cast to Caret
here again?
} | ||
composite.redrawInPixels (null, true); | ||
// redrawInPixels (null, true); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has been removed in a previous PR. My bad, I would rebase this PR now.
private static void handleDPIChange(Widget widget, int newZoom, float scalingFactor) { | ||
widget.nativeZoom = newZoom; | ||
widget.setData(DATA_NATIVE_ZOOM, newZoom); | ||
void handleDPIChange(Event event, float scalingFactor) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why change the signature here instead of sticking to the existing parameters?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We agreed about passing the same event down the same hierarchy and since we have made the method non static now, we do not need Widget anymore but rather the event.
for (int i = 0; i < tabFolder.getItemCount(); i++) { | ||
DPIZoomChangeRegistry.applyChange(tabFolder.items[i], newZoom, scalingFactor); | ||
for (int i = 0; i < getItemCount(); i++) { | ||
items[i].notifyListeners(SWT.ZoomChanged, event); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be items[i].handleDPIChange(...)
for now?
@HeikoKlare I think we have mixed up things. With this PR we just wanted to move to Event driven architecture and not make it asynchronous. I understand that both the terms go hand in hand but we must note that the event model in SWT is synchronous and if an event is sent by a caller, at first the stub is executed and the caller waits for the event to be processed and then moves forward. Hence, this PR doesn't implement asynchrony. That's also the reason why I called notifyListeners instead of calling handleDpiChange because every widget registers to a listener then they must receive the DPI_CHANGE event also through listeners and not by some other widget calling handleDPIChange on them. The follow up PR would implement asynchrony while calling notifyListeners by the following:
and notifyListeners will be replaced by this method. |
So from what you are proposing and what I think how we could do it, I devised the following order:
(The only problem I see is in the first step. If we handle ZoomChangedEvent for Common widgets like StyledText, etc, they are not scaled in the hierarchical order. I need to test if it could cause any trouble.) |
Sounds good, I would just try to split the first step into the adaptation of common/custom widgets and the adaptation of the native part to keep it as small as possible.
But since everything stays synchronous, it should not matter whether you call a registry or whether you send an event. |
This commit replaces the win32-specific caret scaling with API-based resizing to ensure proper repaint on DPI changes. Carets now update location/size via resize() in their DPI change handlers, removing platform dependencies. Additionally, StyledTexts set location, size and visibility of their carets first before calling the DPI change handler of Caret to make sure when Caret is repainted, the size, location and visibility are properly set.
85b3b74
to
3bf732f
Compare
This commit improves thes design implementation for widgets in win32 by moving away from DPIZoomChangeRegistry to an event-driven design using ZoomChanged event and inheritance. contributes to eclipse-platform#62 and eclipse-platform#128
3bf732f
to
70e8d3f
Compare
@HeikoKlare As per our discussion, Replacing CommonWidgetZoomChangeHandler with ZoomChanged Event handler is not possible since the Common widgets need to call for the handleDPIChange for their associated widgets which is win32 specific code and we cannot call notifyListeners on these widgets without making them register to ZoomChanged event as they still use DPIZoomChangeRegistry. Hence, the following is necessary to make it work all together:
For the next step, i.e. asynchrony, we will replace these notifyListeners with a |
This PR improves thes design implementation for widgets in win32 by moving away from DPIZoomChangeRegistry to an event-driven design using ZoomChanged event and inheritance.
contributes to
#62 and #128