From b80ca55f14fc7e0aa582a1b0b2117faf23ec29be Mon Sep 17 00:00:00 2001 From: Mitchell Foral Date: Thu, 1 Dec 2022 15:50:34 +1100 Subject: On Qt, allow string form XPM images for SCI_REGISTERIMAGE. --- qt/ScintillaEditBase/PlatQt.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qt/ScintillaEditBase/PlatQt.cpp') diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 233e114ff..42675933c 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -12,6 +12,7 @@ #include "PlatQt.h" #include "Scintilla.h" +#include "XPM.h" #include "UniConversion.h" #include "DBCS.h" @@ -1146,7 +1147,9 @@ void ListBoxImpl::RegisterQPixmapImage(int type, const QPixmap& pm) void ListBoxImpl::RegisterImage(int type, const char *xpmData) { - RegisterQPixmapImage(type, QPixmap(reinterpret_cast(xpmData))); + XPM xpmImage(xpmData); + RGBAImage rgbaImage(xpmImage); + RegisterRGBAImage(type, rgbaImage.GetWidth(), rgbaImage.GetHeight(), rgbaImage.Pixels()); } void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) -- cgit v1.2.3