+
Skip to content

FvwmPager: Fix SolidSeparators option #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2024
Merged

FvwmPager: Fix SolidSeparators option #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions modules/FvwmPager/init_pager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,18 +567,16 @@ void initialize_desk_style_gcs(DeskStyle *style)
/* create the virtual page boundary GC */
gcv.foreground = style->fg;
gcv.line_width = 1;
gcv.line_style = (use_dashed_separators) ? LineOnOffDash : LineSolid;
gcv.line_style = LineOnOffDash;
style->dashed_gc = fvwmlib_XCreateGC(dpy,
Scr.pager_w, GCForeground | GCLineStyle | GCLineWidth, &gcv);
if (use_dashed_separators) {
/* Although this should already be the default for a freshly
* created GC, some X servers do not draw properly dashed
* lines if the dash style is not set explicitly.
*/
dash_list[0] = 4;
dash_list[1] = 4;
XSetDashes(dpy, style->dashed_gc, 0, dash_list, 2);
}
/* Although this should already be the default for a freshly
* created GC, some X servers do not draw properly dashed
* lines if the dash style is not set explicitly.
*/
dash_list[0] = 4;
dash_list[1] = 4;
XSetDashes(dpy, style->dashed_gc, 0, dash_list, 2);

/* Window borders. */
gcv.foreground = (style->win_cs) ?
Expand Down
12 changes: 8 additions & 4 deletions modules/FvwmPager/x_pager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,8 @@ void draw_desk_grid(int desk)
x1 = (x * desk_w) / fp->virtual_scr.VWidth;
if (!use_no_separators)
{
XDrawLine(dpy, Desks[desk].w, style->dashed_gc,
XDrawLine(dpy, Desks[desk].w, (use_dashed_separators)
? style->dashed_gc : style->label_gc,
x1, y1, x1, y2);
}
x += fpmonitor_get_all_widths();
Expand All @@ -838,7 +839,8 @@ void draw_desk_grid(int desk)
y1 = (y * desk_h) / fp->virtual_scr.VHeight;
if (!use_no_separators)
{
XDrawLine(dpy, Desks[desk].w, style->dashed_gc,
XDrawLine(dpy, Desks[desk].w, (use_dashed_separators)
? style->dashed_gc : style->label_gc,
x1, y1, x2, y1);
}
y += fpmonitor_get_all_heights();
Expand Down Expand Up @@ -972,11 +974,13 @@ void draw_icon_grid(int erase)
rec.width = icon.width / rec.x;
rec.height = icon.height / rec.y;
if (!use_no_separators) {
GC gc = (use_dashed_separators) ? style->dashed_gc : style->label_gc;

for(i = 1; i < rec.x; i++)
XDrawLine(dpy, Scr.icon_w, style->dashed_gc,
XDrawLine(dpy, Scr.icon_w, gc,
i * rec.width, 0, i * rec.width, icon.height);
for(i = 1; i < rec.y; i++)
XDrawLine(dpy, Scr.icon_w, style->dashed_gc,
XDrawLine(dpy, Scr.icon_w, gc,
0, i * rec.height, icon.width, i * rec.height);
}

Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载