wxQt RTL fixes (PR #25822)
AliKet
Some screenshots of the result of this PR:
Widgets demo:
widgets_rtl.png (view on web)
Grid demo:
griddemo_rtl.png (view on web)
AUI demo:
auidemo_rtl.png (view on web)
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/25822
Commit Summary
- 9c868a8 wxQt: Fix window positioning in RTL layout.
- f47a042 wxQt: Fix wxWindow::Refresh() not working correctly in RTL layout.
- 9a0faac wxQt: Fix window scrolling in RTL layout
- cbe1bd0 wxQt: Fix ClientToScreen() and ScreenToClient() to work correctly in RTL layout.
- 1ce42a7 wxQt: Fix popup menu position in RTL layout
- 6919cd1 wxQt: Override wxDC::{Get,Set}LayoutDirection()
- 955bb3a wxQt: Apply custom mirroring to wxDC in RTL layout.
- 8f64804 wxQt: Fix wxDC::GetSize() for wxMemoryDC
- 37b20aa wxQt: Fix wxAuiManager::CalculateHintRect() in RTL layout
- e1a527f wxQt: Fix drawing wxGrid lines in RTL layout
- 40e7903 wxQt: Fix drawing wxTreeCtrl icons in RTL layout
- 59c1788 wxQt: Fix wxOverlay in RTL layout
- a7713e7 wxQt: Fix some native control rendering in RTL layout
- 16083e7 Fix clippingbox's OneDevRegionRTL test case
File Changes
(12 files)
- M include/wx/qt/dc.h (15)
- M include/wx/qt/dcmemory.h (2)
- M include/wx/qt/window.h (7)
- M src/aui/framemanager.cpp (2)
- M src/generic/grid.cpp (2)
- M src/qt/dc.cpp (137)
- M src/qt/dcmemory.cpp (16)
- M src/qt/overlay.cpp (14)
- M src/qt/renderer.cpp (87)
- M src/qt/treectrl.cpp (6)
- M src/qt/window.cpp (181)
- M tests/graphics/clippingbox.cpp (5)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/25822.patch
- https://github.com/wxWidgets/wxWidgets/pull/25822.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
RobertRoeb left a comment (wxWidgets/wxWidgets#25822)Amazing!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
AliKet
@AliKet pushed 10 commits.
- 137006d wxQt: Override wxDC::{Get,Set}LayoutDirection()
- 9413bde wxQt: Override wxDC::GetLayoutDirection() in wxMemoryDC
- 5b0c369 wxQt: Apply custom mirroring to wxDC in RTL layout.
- 6888227 wxQt: Fix wxDC::GetSize() for wxMemoryDC
- cb65081 wxQt: Fix wxAuiManager::CalculateHintRect() in RTL layout
- 6f0062b wxQt: Fix drawing wxGrid lines in RTL layout
- 6686207 wxQt: Fix drawing wxTreeCtrl icons in RTL layout
- a30936a wxQt: Fix wxOverlay in RTL layout
- 4b5f389 wxQt: Fix some native control rendering in RTL layout
- fd7c422 Fix clippingbox's OneDevRegionRTL test case
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
Thanks, this looks good and could be merged AFAICS, I'm not sure why is this in the "draft" state yet?
Also, unfortunately I have no idea why did SliderTestCase start consistently failing with Qt 6.8 just recently, but this is unrelated to this change.
> @@ -117,6 +122,14 @@ class WXDLLIMPEXP_CORE wxQtDCImpl : public wxDCImpl
virtual void* GetHandle() const override { return (void*) m_qtPainter; }
+ // LRT/RTL related functions
Typo:
⬇️ Suggested change- // LRT/RTL related functions + // LTR/RTL related functions
> @@ -3478,11 +3478,13 @@ wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window,
m_frame->ClientToScreen(&rect.x, &rect.y);
+#ifndef __WXQT__
I was always suspicious of this piece of code, if it's not needed for wxQt, it seems to confirm that it shouldn't be necessary for the other ports as well... Do you have any idea what could be wrong in/with them to require it?
In src/qt/dc.cpp:
> @@ -462,10 +496,10 @@ void wxQtDCImpl::Clear()
int width, height;
DoGetSize(&width, &height);
- m_qtPainter->eraseRect( DeviceToLogicalX(0),
- DeviceToLogicalY(0),
- DeviceToLogicalXRel(width),
- DeviceToLogicalYRel(height) );
+ const wxPoint pos = DeviceToLogical(0, 0);
Just to confirm: this doesn't really change anything, does it? I.e. DeviceToLogicalX() etc work too?
> + // For correct result in RTL layout, the drawing is done in a non-mirrored + // DC and the mirroring is done in paintEvent() above.
Sorry, I feel dumb, but I don't really understand why do we need to do this. I.e. what is wrong with using RTL layout for the DC itself instead of mirroring it later?
> + default: + wxFALLTHROUGH; +
I'd remove this to get a warning in the (unlikely) event of more elements being added to this enum.
In tests/graphics/clippingbox.cpp:
> @@ -1033,9 +1033,9 @@ static void OneDevRegionRTL(wxDC& dc, const wxBitmap& bmp, bool useTransformMatr
return;
}
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMSW__)
Could we perhaps add a check for __WXMSW__ below instead of disabling this test entirely for it?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
AliKet
@AliKet pushed 19 commits.
- 95d3fb9 wxQt: Fix window positioning in RTL layout.
- ce427d5 wxQt: Fix wxWindow::Refresh() not working correctly in RTL layout.
- 6f5cbdd wxQt: Fix window scrolling in RTL layout
- 9365edb wxQt: Fix ClientToScreen() and ScreenToClient() to work correctly in RTL layout.
- ba72753 wxQt: Fix popup menu position in RTL layout
- fee7fd7 wxQt: Override wxDC::{Get,Set}LayoutDirection()
- 4b86491 wxQt: Override wxDC::SetLayoutDirection() in wxMemoryDC
- 883f95b wxQt: Apply custom mirroring to wxDC in RTL layout.
- 69243bd wxQt: Simplify wxDC::DoDraw{Rotated}Text() implementations
- 57a9461 wxQt: Fix drawing multiline text with wxDC::DrawText()
- d838e46 wxQt: Fix drawing (rotated) text in RTL layout
- 6d730db wxQt: Fix drawing (rotated) text with GC in RTL layout
- 8f835d4 wxQt: Fix wxDC::GetSize() for wxMemoryDC
- 44f178f wxQt: Fix wxAuiManager::CalculateHintRect() in RTL layout
- c23bca6 wxQt: Fix drawing wxGrid lines in RTL layout
- 594c884 wxQt: Fix drawing wxTreeCtrl icons in RTL layout
- e1ecd45 wxQt: Fix wxOverlay in RTL layout
- 3f82398 wxQt: Fix some native control rendering in RTL layout
- 0174e8c Fix clippingbox's OneDevRegionRTL test case
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
AliKet
@AliKet pushed 12 commits.
- 269829e wxQt: Apply custom mirroring to wxDC in RTL layout.
- e09ea4f wxQt: Simplify wxDC::DoDraw{Rotated}Text() implementations
- 39238fc wxQt: Fix drawing multiline text with wxDC::DrawText()
- e6675e6 wxQt: Fix drawing (rotated) text in RTL layout
- da92795 wxQt: Fix drawing (rotated) text with GC in RTL layout
- 7b98f2c wxQt: Fix wxDC::GetSize() for wxMemoryDC
- 08b2160 wxQt: Fix wxAuiManager::CalculateHintRect() in RTL layout
- ee9aea5 wxQt: Fix drawing wxGrid lines in RTL layout
- 0ed0bcb wxQt: Fix drawing wxTreeCtrl icons in RTL layout
- 3e34e2f wxQt: Fix wxOverlay in RTL layout
- adfe916 wxQt: Fix some native control rendering in RTL layout
- 14dd4a0 Fix clippingbox's OneDevRegionRTL test case
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.