This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via 8fba9945e01aec2e0d58bdbe99c84b4390decabf (commit)
via 30cd22859ac3fe505596b403270291c237be1470 (commit)
via 5d643a67dd8156029ebcacbd15110929eef8dbb5 (commit)
from e13cfcd093835c4ad9cde4b52c95234f5cbeedbe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8fba9945e01aec2e0d58bdbe99c84b4390decabf
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Mon, 20 Mar 2017 01:09:55 -0400
URL: <http://repo.or.cz/wmaker-crm.git/8fba9945e01aec2e>
WPrefs: Properly read system fonts in font configuration panel.
Previously, only the user's WMGLOBAL file would be read to determine the
current WINGs fonts (System Font and Bold System Font) in the Font
Configuration panel. It is quite possible that this information would
not be in the user's WMGLOBAL file, but instead in the system WMGLOBAL
file.
We instead use the WMDefaultSystemFont and WMBoldDefaultSystemFont
functions to get this information.
---
WPrefs.app/FontSimple.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c
index 2262e58139ea..b545fd14f7ea 100644
--- a/WPrefs.app/FontSimple.c
+++ b/WPrefs.app/FontSimple.c
@@ -569,6 +569,9 @@ static void showData(_Panel * panel)
{
int i;
WMMenuItem *item;
+ WMScreen *scr;
+
+ scr = WMWidgetScreen(panel->parent);
for (i = 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++) {
char *ofont, *font;
@@ -579,19 +582,12 @@ static void showData(_Panel * panel)
if (ofont)
wfree(ofont);
- if (strcmp(fontOptions[i].option, "SystemFont") == 0 ||
- strcmp(fontOptions[i].option, "BoldSystemFont") == 0) {
- char *path;
- WMUserDefaults *defaults;
-
- path = wdefaultspathfordomain("WMGLOBAL");
- defaults = WMGetDefaultsFromPath(path);
- wfree(path);
- font = WMGetUDStringForKey(defaults,
- fontOptions[i].option);
- } else {
+ if (strcmp(fontOptions[i].option, "SystemFont") == 0)
+ font = WMGetFontName(WMDefaultSystemFont(scr));
+ else if (strcmp(fontOptions[i].option, "BoldSystemFont") == 0)
+ font = WMGetFontName(WMDefaultBoldSystemFont(scr));
+ else
font = GetStringForKey(fontOptions[i].option);
- }
if (font)
font = wstrdup(font);
WMSetMenuItemRepresentedObject(item, font);
commit 30cd22859ac3fe505596b403270291c237be1470
Merge: e13cfcd09383 5d643a67dd81
Author: Carlos R. Mafra <crma...@gmail.com>
Date: Mon, 20 Mar 2017 18:03:24 +0000
URL: <http://repo.or.cz/wmaker-crm.git/30cd22859ac3fe50>
Merge branch 'master' into next
I forgot to add the wmaker 0.95.8 commit back into the next
branch. Doing it now.
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/FontSimple.c | 20 ++++++++------------
configure.ac | 2 +-
2 files changed, 9 insertions(+), 13 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
