Merge branch 'bertwesarg-affinity-fix-panel-width'

htop-dev · Aug 26, 2020 · 4a8ae4b · 4a8ae4b
2 parents df7e4fc + 94b8c2e
commit 4a8ae4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);