Skip to content

Commit

Permalink
FvwnIconMan use font as fallback for tips font.
Browse files Browse the repository at this point in the history
  If TipsFont is not set, use the Font setting instead of falling
  back to a default font.
  • Loading branch information
somiaj authored and ThomasAdam committed Nov 7, 2022
1 parent 5e79143 commit 1d4648c
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions modules/FvwmIconMan/x.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,11 +639,14 @@ void X_init_manager (int man_id)
ShutMeDown (1);
}

if (man->tips_fontname == NULL)
man->tips_conf->Ffont = FlocaleLoadFont(theDisplay, NULL, MyName);
else
if (man->tips_fontname != NULL)
man->tips_conf->Ffont = FlocaleLoadFont(
theDisplay, man->tips_fontname, MyName);
else if (man->fontname != NULL)
man->tips_conf->Ffont = FlocaleLoadFont(
theDisplay, man->fontname, MyName);
else
man->tips_conf->Ffont = FlocaleLoadFont(theDisplay, NULL, MyName);

for ( i = 0; i < NUM_CONTEXTS; i++ ) {
man->pixmap[i] = None;
Expand Down

0 comments on commit 1d4648c

Please sign in to comment.