zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Nathan Scott 2020-08-27 09:36:56 +10:00
parent df7e4fcdc0 94b8c2e714
commit 4a8ae4b5d4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Action.c
View File

@ -320,6 +320,7 @@ static Htop_Reaction actionSetAffinity(State* st) {
if (!affinity1) return HTOP_OK; if (!affinity1) return HTOP_OK;
int width; int width;
Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1, &width); Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1, &width);
width += 1; /* we add a gap between the panels */
Affinity_delete(affinity1); Affinity_delete(affinity1);
void* set = Action_pickFromVector(st, affinityPanel, width, true); void* set = Action_pickFromVector(st, affinityPanel, width, true);

4
AffinityPanel.c
View File

@ -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)); Panel_init(super, 1, 1, 1, 1, Class(MaskItem), false, FunctionBar_new(AffinityPanelFunctions, AffinityPanelKeys, AffinityPanelEvents));
this->pl = pl; 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); this->cpuids = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);