More wxQt fixes. (PR #24309)
dsa-t
Fixes for some more bugs encountered when running KiCad.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/24309
Commit Summary
- 7a0149d Show popup menu at cursor on wxQt if needed.
- e011963 Support SetLabel/GetLabel for wxRadioBox/wxRadioButton on wxQt.
- 6ff8678 Call base class in SetLabel for some widgets on wxQt.
- ffe38f2 Support mask in wxBitmap from wxImage on wxQt.
File Changes
(9 files)
- M include/wx/qt/radiobox.h (3)
- M include/wx/qt/radiobut.h (3)
- M src/qt/anybutton.cpp (2)
- M src/qt/bitmap.cpp (3)
- M src/qt/checkbox.cpp (2)
- M src/qt/radiobox.cpp (11)
- M src/qt/radiobut.cpp (12)
- M src/qt/statbox.cpp (6)
- M src/qt/window.cpp (9)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/24309.patch
- https://github.com/wxWidgets/wxWidgets/pull/24309.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz approved this pull request.
Looks good to me, thanks!
@AliKet any comments?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
AliKet
@AliKet commented on this pull request.
> @@ -237,6 +237,9 @@ void wxBitmap::InitFromImage(const wxImage& image, int depth, double WXUNUSED(sc
? QBitmap::fromImage(ConvertImage(image), Qt::ThresholdDither)
: QPixmap::fromImage(ConvertImage(image, &mask));
+ if (mask)
+ qtImage.setMask(*mask->GetHandle());
+
Keeping the mask seperated from the qtImage is intentional because this is how the other ports works. IOW, setMask() merges the mask with the pixmap's alpha channel. And AFAIK none of the other ports do this by default.
If you really want the mask be merged just be explicit and call wxBitmap::QtBlendMaskWithAlpha()
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
dsa-t
@dsa-t pushed 1 commit.
- bff40b6 Blend mask with alpha for wxCursor initialized from wxImage on wxQt.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
AliKet
@AliKet approved this pull request.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Merged #24309 into master.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.