github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-24 14:22:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Fixed Gtk ImageDraw text caching bug (causing problems with text in icondes)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8087 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-01-22 09:44:45 +00:00
parent d274c57edc
commit ee33dfc5f9
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/CtrlCore.upp
View file

@ -35,7 +35,7 @@ library(DRAGONFLY) "Xext Xinerama";
file
Core readonly separator,
CtrlCore.h options PCH,
CtrlCore.h options(BUILDER_OPTION) PCH,
MKeys.h,
stdids.h,
SystemDraw.cpp,

4
uppsrc/CtrlCore/GtkDrawImage.cpp
View file

@ -138,6 +138,10 @@ void CairoGet(ImageBuffer& b, Size isz, cairo_surface_t *surface, cairo_surface_
void ImageDraw::FetchStraight(ImageBuffer& b) const
{
ImageDraw *m = const_cast<ImageDraw *>(this);
m->FlushText();
if(alpha_surface)
m->alpha.FlushText();
CairoGet(b, isz, surface, alpha_surface);
}

2
uppsrc/CtrlCore/init
View file

@ -3,7 +3,7 @@
#include "Draw/init"
#include "plugin\bmp/init"
#include "RichText/init"
#define BLITZ_INDEX__ F656a4ea94e4f808b1ec63034b0e6c5ac
#define BLITZ_INDEX__ Fe2ff541f9bb9f4ad3f5bcc23a34e1b73
#include "CtrlCore.icpp"
#undef BLITZ_INDEX__
#endif

2
uppsrc/IconDes/IconDes.upp
View file

@ -8,7 +8,7 @@ uses
RichEdit;
file
IconDes.h options PCH,
IconDes.h options(BUILDER_OPTION) PCH,
IconDes.key,
IconDraw.cpp,
AlphaCtrl.cpp,

2
uppsrc/ide/ide.upp
View file

@ -25,7 +25,7 @@ link(WIN32 MSC) /MAP;
file
IDE readonly separator,
ide.h options PCH,
ide.h options(BUILDER_OPTION) PCH,
version.h,
UppDlg.h,
BaseDlg.cpp,