Hugh McMaster : wineconsole: Add if check to determine whether a font attribute has changed.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 2 09:47:15 CST 2015


Module: wine
Branch: master
Commit: 9096373048677e2791e819648c82aff352c882d7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9096373048677e2791e819648c82aff352c882d7

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Thu Oct 29 23:17:17 2015 +1100

wineconsole: Add if check to determine whether a font attribute has changed.

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/wineconsole/wineconsole.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index e1ee55b..eb07f6b 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -27,7 +27,7 @@
 #include "winecon_private.h"
 #include "winnls.h"
 #include "winuser.h"
-
+#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wineconsole);
@@ -421,7 +421,8 @@ void     WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
     }
     data->curcfg.menu_mask = cfg->menu_mask;
     data->curcfg.quick_edit = cfg->quick_edit;
-    if (1 /* FIXME: font info has changed */)
+    if (strcmpiW(data->curcfg.face_name, cfg->face_name) || data->curcfg.cell_width != cfg->cell_width ||
+        data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight)
     {
         data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight);
     }




More information about the wine-cvs mailing list