From f861a2c61692eda9d24fc5e32608b3a56bb721bc Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Mon, 31 Aug 2020 22:08:35 +0200 Subject: Revert "Use UTF-8 for check buttons and tree open/closed" This reverts commit 5d5913d355b3a9f03da589b3542b8f55467b4ed6. --- AffinityPanel.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'AffinityPanel.c') diff --git a/AffinityPanel.c b/AffinityPanel.c index e95b381e..23f0ca80 100644 --- a/AffinityPanel.c +++ b/AffinityPanel.c @@ -55,20 +55,20 @@ static void MaskItem_delete(Object* cast) { static void MaskItem_display(Object* cast, RichString* out) { MaskItem* this = (MaskItem*)cast; assert (this != NULL); + RichString_append(out, CRT_colors[CHECK_BOX], "["); if (this->value == 2) - RichString_append(out, CRT_colors[CHECK_MARK], CRT_checkStr[CHECK_STR_FULL]); + RichString_append(out, CRT_colors[CHECK_MARK], "x"); else if (this->value == 1) - RichString_append(out, CRT_colors[CHECK_MARK], CRT_checkStr[CHECK_STR_PARTIAL]); + RichString_append(out, CRT_colors[CHECK_MARK], "o"); else - RichString_append(out, CRT_colors[CHECK_MARK], CRT_checkStr[CHECK_STR_NONE]); + RichString_append(out, CRT_colors[CHECK_MARK], " "); + RichString_append(out, CRT_colors[CHECK_BOX], "]"); RichString_append(out, CRT_colors[CHECK_TEXT], " "); if (this->indent) RichString_append(out, CRT_colors[PROCESS_TREE], this->indent); if (this->sub_tree) { - RichString_append(out, CRT_colors[PROCESS_TREE], - this->sub_tree == 1 - ? CRT_collapStr[COLLAP_STR_OPEN] - : CRT_collapStr[COLLAP_STR_CLOSED]); + RichString_append(out, CRT_colors[ PROCESS_TREE], + this->sub_tree == 1 ? "[-]" : "[+]"); RichString_append(out, CRT_colors[CHECK_TEXT], " "); } RichString_append(out, CRT_colors[CHECK_TEXT], this->text); @@ -303,7 +303,7 @@ static MaskItem *AffinityPanel_addObject(AffinityPanel* this, hwloc_obj_t obj, u } /* "[x] " + "|- " * depth + ("[+] ")? + name */ - unsigned width = (CRT_utf8 ? 2 : 4) + 3 * depth + (item->sub_tree ? (CRT_utf8 ? 2 : 4) : 0) + strlen(buf); + unsigned width = 4 + 3 * depth + (item->sub_tree ? 4 : 0) + strlen(buf); if (width > this->width) this->width = width; -- cgit v1.2.3