mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-27 02:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1995 from RedSoxFan/fix-1985

Browse source 
Change scale from int32_t to double for pango
This commit is contained in:
Drew DeVault 2018-05-16 12:27:11 -04:00 committed by GitHub
parent 6a13f3eb38 0944d3fd9c
commit fe24f58297
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/pango.c
View file

@ -71,7 +71,7 @@ int escape_markup_text(const char *src, char *dest, int dest_length) {
} }
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
const char *text, int32_t scale, bool markup) { const char *text, double scale, bool markup) {
PangoLayout *layout = pango_cairo_create_layout(cairo); PangoLayout *layout = pango_cairo_create_layout(cairo);
PangoAttrList *attrs; PangoAttrList *attrs;
if (markup) { if (markup) {
@ -103,7 +103,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
} }
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
int32_t scale, bool markup, const char *fmt, ...) { double scale, bool markup, const char *fmt, ...) {
static char buf[2048]; static char buf[2048];
va_list args; va_list args;
@ -120,7 +120,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
} }
void pango_printf(cairo_t *cairo, const char *font, void pango_printf(cairo_t *cairo, const char *font,
int32_t scale, bool markup, const char *fmt, ...) { double scale, bool markup, const char *fmt, ...) {
static char buf[2048]; static char buf[2048];
va_list args; va_list args;

6
include/pango.h
View file

@ -18,10 +18,10 @@
*/ */
int escape_markup_text(const char *src, char *dest, int dest_length); int escape_markup_text(const char *src, char *dest, int dest_length);
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
const char *text, int32_t scale, bool markup); const char *text, double scale, bool markup);
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
int32_t scale, bool markup, const char *fmt, ...); double scale, bool markup, const char *fmt, ...);
void pango_printf(cairo_t *cairo, const char *font, void pango_printf(cairo_t *cairo, const char *font,
int32_t scale, bool markup, const char *fmt, ...); double scale, bool markup, const char *fmt, ...);
#endif #endif