From 94b8c2e714e740639f0c345e9df5b6de7cbe966a Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Wed, 26 Aug 2020 22:03:04 +0200 Subject: fix width of `AffinitPanel` The panel size of 15 includes the gap to the next panel, thus use 14 as the minimum size and let the caller of `AffinityPanel_new` handle the gap. --- Action.c | 1 + AffinityPanel.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Action.c b/Action.c index 363c2b98..d9cc5abf 100644 --- a/Action.c +++ b/Action.c @@ -320,6 +320,7 @@ static Htop_Reaction actionSetAffinity(State* st) { if (!affinity1) return HTOP_OK; int width; Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1, &width); + width += 1; /* we add a gap between the panels */ Affinity_delete(affinity1); void* set = Action_pickFromVector(st, affinityPanel, width, true); diff --git a/AffinityPanel.c b/AffinityPanel.c index 7accb2ab..e95b381e 100644 --- a/AffinityPanel.c +++ b/AffinityPanel.c @@ -352,7 +352,9 @@ Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity, int* width) { Panel_init(super, 1, 1, 1, 1, Class(MaskItem), false, FunctionBar_new(AffinityPanelFunctions, AffinityPanelKeys, AffinityPanelEvents)); this->pl = pl; - this->width = 15; + /* defaults to 15, this also includes the gap between the panels, + * but this will be added by the caller */ + this->width = 14; this->cpuids = Vector_new(Class(MaskItem), true, DEFAULT_SIZE); -- cgit v1.2.3