add proc width percentage to presets

Author: vandabbin

src/btop_config.cpp

@@ -73,8 +73,9 @@ namespace Config {
 
 		{"presets",				"#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.\n"
 								"#* Format: \"box_name:P:G,box_name:P:G\" P=(0 or 1) for alternate positions, G=graph symbol to use for box.\n"
+								"#* proc box format can also be \"proc:P:G:W\" W=(0-100) for proc width percentage.\n"
 								"#* Use whitespace \" \" as separator between different presets.\n"
-								"#* Example: \"cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty\""},
+								"#* Example: \"cpu:0:default,mem:0:tty,proc:1:default:80 cpu:0:braille,proc:0:tty\""},
 
 		{"vim_keys",			"#* Set to True to enable \"h,j,k,l,g,G\" keys for directional control in lists.\n"
 								"#* Conflicting keys for h:\"help\" and k:\"kill\" is accessible while holding shift."},
@@ -468,7 +469,7 @@ namespace Config {
 					return false;
 				}
 				const auto& vals = ssplit(box, ':');
-				if (vals.size() != 3) {
+				if (vals.size() != 3 and not (vals.size() == 4 and vals.at(0) == "proc")) {
 					validError = "Malformatted preset in config value presets!";
 					return false;
 				}
@@ -484,6 +485,10 @@ namespace Config {
 					validError = "Invalid graph name in config value presets!";
 					return false;
 				}
+				if (vals.size() == 4 and not (vals.at(3) == "default" or intValid("", vals.at(3)))) {
+					validError = "Invalid proc width percent in config value presets!";
+					return false;
+				}
 			}
 			new_presets.push_back(preset);
 		}
@@ -515,6 +520,7 @@ namespace Config {
 				set("mem_below_net", (vals.at(1) != "0"));
 			} else if (vals.at(0) == "proc") {
 				set("proc_left", (vals.at(1) != "0"));
+				set("proc_box_width_percent", (vals.size() == 4 and vals.at(3) != "default") ? std::clamp(stoi(vals.at(3)), 0, 100) : Proc::width_p);
 			}
 			if (vals.at(0).starts_with("gpu")) {
 				set("graph_symbol_gpu", vals.at(2));

src/btop_input.cpp

@@ -313,7 +313,7 @@ namespace Input {
 							new_proc_box_width_percent = Proc::width_p; // set to default width
 
 						if (proc_box_width_percent != new_proc_box_width_percent) {
-							Config::current_preset = -1;
+							Config::current_preset.reset();
 							Config::set("proc_box_width_percent", new_proc_box_width_percent);
 							Draw::calcSizes(!Proc::shown);
 							Draw::update_clock(true);

src/btop_menu.cpp

@@ -291,11 +291,14 @@ namespace Menu {
 				"P=(0 or 1) for alternate positions.",
 				"G=graph symbol to use for box.",
 				"",
+				"proc box format can also be \"proc:P:G:W\"",
+				"W=(0 - 100) for box width percentage.\n",
+				"",
 				"Use whitespace \" \" as separator between",
 				"different presets.",
 				"",
 				"Example:",
-				"\"mem:0:tty,proc:1:default cpu:0:braille\""},
+				"\"mem:0:tty,proc:1:default:80 cpu:0:braille\""},
 			{"shown_boxes",
 				"Manually set which boxes to show.",
 				"",
@@ -1388,6 +1391,7 @@ static int optionsMenu(const string& key) {
 					if (option == "proc_box_width_percent") {
 						editor.text = fmt::format("{}", std::clamp(stoi(editor.text), 0, 100));
 						screen_redraw = true;
+						Config::current_preset.reset();
 					}
 					Config::set(option, stoi(editor.text));
 				}
@@ -1477,6 +1481,7 @@ static int optionsMenu(const string& key) {
 					if (option == "proc_box_width_percent") {
 						value = std::clamp(static_cast<int>(value), 0, 100);
 						screen_redraw = true;
+						Config::current_preset.reset();
 					}
 					Config::set(option, static_cast<int>(value));
 				}