Merge branch 'main' into OSX

CHANGELOG.md

@@ -1,4 +1,4 @@
-## v1.0.14 (next release)
+## v1.0.14
 
 * Changed: Total system memory is checked at every update instead of once at start
 
@@ -8,6 +8,8 @@
 
 * Fixed: snap root disk and changed to compiler flags instead of env variables for detection
 
+* Added: Development branch for OSX, by @joske
+
 ## v1.0.13
 
 * Changed: Graph empty symbol is now regular whitespace

README.md

@@ -38,6 +38,11 @@
 
 ### Under development
 
+##### 6 October 2021
+
+OsX development have been started by @joske , big thanks :)
+See branch [OSX](https://github.com/aristocratos/btop/tree/OSX) for current progress.
+
 ##### 18 September 2021
 
 The Linux version of btop++ is complete. Released as version 1.0.0

src/btop.cpp

@@ -55,7 +55,7 @@ namespace Global {
 		{"#801414", "██████╔╝   ██║   ╚██████╔╝██║        ╚═╝    ╚═╝"},
 		{"#000000", "╚═════╝    ╚═╝    ╚═════╝ ╚═╝"},
 	};
-	const string Version = "1.0.13";
+	const string Version = "1.0.14";
 
 	int coreCount;
 	string overlay;

src/linux/btop_collect.cpp

@@ -896,7 +896,11 @@ namespace Mem {
 					disks.at("swap").free_percent = mem.percent.at("swap_free").back();
 				}
 				for (const auto& name : last_found)
-					if (not is_in(name, "/", "swap")) mem.disks_order.push_back(name);
+					#ifdef SNAPPED
+						if (not is_in(name, "/mnt", "swap")) mem.disks_order.push_back(name);
+					#else
+						if (not is_in(name, "/", "swap")) mem.disks_order.push_back(name);
+					#endif
 
 				//? Get disks IO
 				int64_t sectors_read, sectors_write, io_ticks;