diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-25 09:31:33 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-25 09:31:33 +0000 |
| commit | 47d6bf375bcfd2a83041e79afcf5720dde5aa383 (patch) | |
| tree | 582f97e0c0061f4fdab0b046dc1b2aabd14180e8 /scintilla/src/LineMarker.cxx | |
| parent | 00fbf8554b38ac1ffe48ccd859a55e1c5a7ba434 (diff) | |
| download | notepad2-mod-47d6bf375bcfd2a83041e79afcf5720dde5aa383.zip notepad2-mod-47d6bf375bcfd2a83041e79afcf5720dde5aa383.tar.gz notepad2-mod-47d6bf375bcfd2a83041e79afcf5720dde5aa383.tar.bz2 | |
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@552 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src/LineMarker.cxx')
| -rw-r--r-- | scintilla/src/LineMarker.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/scintilla/src/LineMarker.cxx b/scintilla/src/LineMarker.cxx index 688d139..c965724 100644 --- a/scintilla/src/LineMarker.cxx +++ b/scintilla/src/LineMarker.cxx @@ -7,6 +7,9 @@ #include <string.h>
+#include <vector>
+#include <map>
+
#include "Platform.h"
#include "Scintilla.h"
@@ -38,6 +41,12 @@ void LineMarker::SetXPM(const char *const *linesForm) { markType = SC_MARK_PIXMAP;
}
+void LineMarker::SetRGBAImage(Point sizeRGBAImage, const unsigned char *pixelsRGBAImage) {
+ delete image;
+ image = new RGBAImage(sizeRGBAImage.x, sizeRGBAImage.y, pixelsRGBAImage);
+ markType = SC_MARK_RGBAIMAGE;
+}
+
static void DrawBox(Surface *surface, int centreX, int centreY, int armSize, ColourAllocated fore, ColourAllocated back) {
PRectangle rc;
rc.left = centreX - armSize;
@@ -96,6 +105,10 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac pxpm->Draw(surface, rcWhole);
return;
}
+ if ((markType == SC_MARK_RGBAIMAGE) && (image)) {
+ surface->DrawRGBAImage(rcWhole, image->GetWidth(), image->GetHeight(), image->Pixels());
+ return;
+ }
// Restrict most shapes a bit
PRectangle rc = rcWhole;
rc.top++;
|