suwako/UnixCalc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ごめん

Browse Source
This commit is contained in:
テクニカル諏訪子
2026-01-17 18:39:32 +09:00
parent fa83f224e2
commit c6f2982855
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/display.c
View File

@@ -6,7 +6,8 @@
void drawbuttons(UiSystem *ui, SuwaButton *btn, XftDraw *xftdraw) { void drawbuttons(UiSystem *ui, SuwaButton *btn, XftDraw *xftdraw) {
unsigned long curbg = btn->pressed ? BTSEL : BTCOL; unsigned long curbg = btn->pressed ? BTSEL : BTCOL;
XSetForeground(ui->display, ui->gc, curbg); XSetForeground(ui->display, ui->gc, curbg);
XFillRectangle(ui->display, ui->target, ui->gc, btn->x, btn->y, btn->width, btn->height); XFillRectangle(ui->display, ui->target, ui->gc, btn->x, btn->y,
btn->width, btn->height);
// 文字の中央に // 文字の中央に
if (btn->label && ui->font && xftdraw) { if (btn->label && ui->font && xftdraw) {
@@ -24,7 +25,7 @@ void drawbuttons(UiSystem *ui, SuwaButton *btn, XftDraw *xftdraw) {
// tx -= extents.x; // tx -= extents.x;
XftDrawStringUtf8(xftdraw, &ui->textcolor, ui->font, tx, ty, XftDrawStringUtf8(xftdraw, &ui->color, ui->font, tx, ty,
(FcChar8 *)btn->label, len); (FcChar8 *)btn->label, len);
} }
} }

2
src/utils.c
View File

@@ -1,6 +1,8 @@
#include "utils.h" #include "utils.h"
void cleanup(UiSystem *ui) { void cleanup(UiSystem *ui) {
if (ui->textcolor.pixel != 0)
XftColorFree(ui->display, &ui->visual, ui->colormap, &ui->textcolor);
if (ui->btncolor.pixel != 0) if (ui->btncolor.pixel != 0)
XftColorFree(ui->display, &ui->visual, ui->colormap, &ui->btncolor); XftColorFree(ui->display, &ui->visual, ui->colormap, &ui->btncolor);
if (ui->color.pixel != 0) if (ui->color.pixel != 0)