From c4655a19e1e0104e64724ca28ad57ba5f7ad4800 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 30 Dec 2021 16:51:53 -0800
Subject: [PATCH] Add toolbar buttons for 'additive selection' as well as
 'auto-expand selection'.

---
 resources/Makefile                      |  2 ++
 resources/bitmaps/select_additive.xpm   | 22 ++++++++++++++++++++++
 resources/bitmaps/select_autoexpand.xpm | 22 ++++++++++++++++++++++
 src/mainframe.cpp                       |  5 +++++
 4 files changed, 51 insertions(+)
 create mode 100644 resources/bitmaps/select_additive.xpm
 create mode 100644 resources/bitmaps/select_autoexpand.xpm

diff --git a/resources/Makefile b/resources/Makefile
index 1720ce4..5f913b6 100644
--- a/resources/Makefile
+++ b/resources/Makefile
@@ -63,6 +63,8 @@ all:
 	cp -vf ./bitmaps/scalelockx.xpm ../build/bitmaps/scalelockx.xpm
 	cp -vf ./bitmaps/scalelocky.xpm ../build/bitmaps/scalelocky.xpm
 	cp -vf ./bitmaps/scalelockz.xpm ../build/bitmaps/scalelockz.xpm
+	cp -vf ./bitmaps/select_additive.xpm ../build/bitmaps/select_additive.xpm
+	cp -vf ./bitmaps/select_autoexpand.xpm ../build/bitmaps/select_autoexpand.xpm
 	cp -vf ./bitmaps/selection_csgmerge.xpm ../build/bitmaps/selection_csgmerge.xpm
 	cp -vf ./bitmaps/selection_csgsubtract.xpm ../build/bitmaps/selection_csgsubtract.xpm
 	cp -vf ./bitmaps/selection_makehollow.xpm ../build/bitmaps/selection_makehollow.xpm
diff --git a/resources/bitmaps/select_additive.xpm b/resources/bitmaps/select_additive.xpm
new file mode 100644
index 0000000..565faac
--- /dev/null
+++ b/resources/bitmaps/select_additive.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * select_additive_xpm[] = {
+"16 16 3 1",
+" 	c None",
+".	c #46E3FB",
+"+	c #23727E",
+"                ",
+" .............. ",
+" .            . ",
+" .            . ",
+" .     .      . ",
+" .     .+     . ",
+" .     .+     . ",
+" .  .......   . ",
+" .   ++.++++  . ",
+" .     .+     . ",
+" .     .+     . ",
+" .      +     . ",
+" .            . ",
+" .            . ",
+" .............. ",
+"                "};
diff --git a/resources/bitmaps/select_autoexpand.xpm b/resources/bitmaps/select_autoexpand.xpm
new file mode 100644
index 0000000..4ff8b7a
--- /dev/null
+++ b/resources/bitmaps/select_autoexpand.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * select_autoexpand_xpm[] = {
+"16 16 3 1",
+" 	c None",
+".	c #46E3FB",
+"+	c #2C909F",
+"                ",
+" .............. ",
+" .            . ",
+" .    ..      . ",
+" .  .. +..    . ",
+" .  ..+ ..+   . ",
+" .  ..+ ..+   . ",
+" .  ......+   . ",
+" .  ..++..+   . ",
+" .  ..+ ..+   . ",
+" .  ..+ ..+   . ",
+" .  ..+ ..+   . ",
+" .   ++  ++   . ",
+" .            . ",
+" .............. ",
+"                "};
diff --git a/src/mainframe.cpp b/src/mainframe.cpp
index 867b8ff..dfdd6b7 100644
--- a/src/mainframe.cpp
+++ b/src/mainframe.cpp
@@ -2453,6 +2453,11 @@ ui::Toolbar create_main_toolbar()
 	toolbar_append_button(toolbar, "Refresh Assets", "refresh_models.xpm",
 	                      "RefreshReferences");
 
+	toolbar_append_toggle_button(toolbar, "Auto-Expand Selection", "select_autoexpand.xpm",
+	                      "ToggleExpansion");
+	toolbar_append_toggle_button(toolbar, "Additive Selection", "select_additive.xpm",
+	                      "ToggleAddSelect");
+
 	PluginToolbar_AddToMain(toolbar);