tyler/pinentry-dmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

border width fixed

Browse Source
This commit is contained in:
mrdotx 2022-04-29 08:21:33 +02:00
parent fa3c8f28c6
commit f9f98b8f56
No known key found for this signature in database
GPG Key ID: 433F70E636E6EB87
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pinentry-dmenu.c
View File

@ -292,7 +292,7 @@ drawwin(void) {
drw_setscheme(drw, scheme[SchemeDesc]); drw_setscheme(drw, scheme[SchemeDesc]);
if (center) { if (center) {
drw_text(drw, promptw + ppromptw, lineheight, centerwidth, drw_text(drw, promptw + ppromptw, lineheight, centerwidth,
bh + borderwidth, lrpad / 2, bh, lrpad / 2,
pinentry_info->description, 0); pinentry_info->description, 0);
} else { } else {
drw_text(drw, pb, 0, pbw, bh, lrpad / 2, drw_text(drw, pb, 0, pbw, bh, lrpad / 2,
@ -357,7 +357,7 @@ setup(void) {
/* Calculate menu geometry */ /* Calculate menu geometry */
bh = MAX(drw->fonts->h + 2, lineheight); /* at least line height */ bh = MAX(drw->fonts->h + 2, lineheight); /* at least line height */
mh = bh; mh = bh + (borderwidth * 2);
#ifdef XINERAMA #ifdef XINERAMA
info = XineramaQueryScreens(dpy, &n); info = XineramaQueryScreens(dpy, &n);
@ -394,14 +394,14 @@ setup(void) {
} }
if (center) { if (center) {
mw = MIN(centerwidth, info[i].width); mw = MIN(centerwidth, info[i].width) - (borderwidth * 2);
mh *= 2; mh = (mh * 2) - (borderwidth * 2);
x = info[i].x_org + ((info[i].width - mw) / 2); x = info[i].x_org + ((info[i].width - mw) / 2);
y = info[i].y_org + ((info[i].height - mh) / 2); y = info[i].y_org + ((info[i].height - mh) / 2);
} else { } else {
x = info[i].x_org; x = info[i].x_org;
y = info[i].y_org + (bottom ? info[i].height - mh : 0); y = info[i].y_org + (bottom ? info[i].height - mh : 0);
mw = info[i].width; mw = info[i].width - (borderwidth * 2);
} }
XFree(info); XFree(info);
@ -413,14 +413,14 @@ setup(void) {
} }
if (center) { if (center) {
mw = MIN(centerwidth, wa.width); mw = MIN(centerwidth, wa.width) - (borderwidth * 2);
mh *= 2; mh = mh * 2 - (borderwidth * 2);
x = (wa.width - mw) / 2; x = (wa.width - mw) / 2;
y = (wa.height - mh) / 2; y = (wa.height - mh) / 2;
} else { } else {
x = 0; x = 0;
y = bottom ? wa.height - mh : 0; y = bottom ? wa.height - mh : 0;
mw = wa.width; mw = wa.width - (borderwidth * 2);
} }
} }
@ -432,8 +432,7 @@ setup(void) {
swa.border_pixel = 0; swa.border_pixel = 0;
swa.colormap = cmap; swa.colormap = cmap;
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
win = XCreateWindow(dpy, parentwin, x, y, win = XCreateWindow(dpy, parentwin, x, y, mw, mh - (borderwidth * 2),
mw - (borderwidth * 2), mh - (borderwidth * 2),
borderwidth, depth, CopyFromParent, visual, borderwidth, depth, CopyFromParent, visual,
CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &swa); CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &swa);
if (borderwidth) if (borderwidth)