interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the GTK+ SetColor() issues. It works!

This commit is contained in:
Pietro Gagliardi 2016-04-20 01:14:46 -04:00
parent 78772ca62d
commit 8493bc3c5d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/GNUfiles.mk
View File

@ -40,7 +40,7 @@ CFLAGS += \
CXXFLAGS += \ CXXFLAGS += \
`pkg-config --cflags gtk+-3.0` `pkg-config --cflags gtk+-3.0`
LDFLAGS += \ LDFLAGS += \
`pkg-config --libs gtk+-3.0` -lm `pkg-config --libs gtk+-3.0` -lm -ldl
# flags for building a shared library # flags for building a shared library
# OS X does support -shared but it has a preferred name for this so let's use that there instead; hence this is not gcc-global # OS X does support -shared but it has a preferred name for this so let's use that there instead; hence this is not gcc-global

5
unix/draw.c
View File

@ -689,7 +689,7 @@ static void prepareLayout(uiDrawTextLayout *layout, PangoLayout *pl)
width = -1; width = -1;
pango_layout_set_width(pl, width); pango_layout_set_width(pl, width);
pango_layout_set_attribute_list(pl, layout->attrs); pango_layout_set_attributes(pl, layout->attrs);
} }
void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height) void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height)
@ -745,6 +745,7 @@ static void try138(void)
void *handle; void *handle;
tried138 = TRUE; tried138 = TRUE;
// dlsym() walks the dependency chain, so opening the current process should be sufficient
handle = dlopen(NULL, RTLD_LAZY); handle = dlopen(NULL, RTLD_LAZY);
if (handle == NULL) if (handle == NULL)
return; return;
@ -769,9 +770,7 @@ void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, intmax_t startChar, intm
try138(); try138();
// TODO what if aa == 0? // TODO what if aa == 0?
if (newFGAlphaAttr != NULL) { if (newFGAlphaAttr != NULL) {
g_printf("adding alpha\n");
attr = (*newFGAlphaAttr)(aa); attr = (*newFGAlphaAttr)(aa);
addAttr(layout, attr, startChar, endChar); addAttr(layout, attr, startChar, endChar);
} }
else g_printf("ignoring alpha\n");
} }