Merge remote-tracking branch 'remotes/origin/main' into feature/direct_typing

Fixing conflicts and little error in destructor

Author: Sebi

CMakeLists.txt

@@ -58,7 +58,11 @@ add_subdirectory("Thirdparty/nativefiledialog-extended")
 # DasherUI
 ###############################
 
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+IF (WIN32)
+	# Hide console window
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+ENDIF()
+
 ADD_Executable(DasherUI
 	${PROJECT_SOURCE_DIR}/src/DasherController.cpp
 	${PROJECT_SOURCE_DIR}/src/DasherController.h

DasherCore

@@ -0,0 +1,12 @@
+# DasherUI
+This repository features a simple UI, written in ImGui, for the DasherCore backend. Its main purpose is the testing/development of the DasherCore library. So it is not meant for pretty looks or actual usability. 
+
+## Cloning and Building
+1. Clone the repository with all submodules: `git clone --recursive https://github.com/PapeCoding/DasherUI.git ./DasherUI`
+2. Generate some project files with CMake:
+  * `cd ./DasherUI && mkdir build && cd build`
+  * `cmake ..`
+3. Build the project with the selected build system (e.g. Visual Studio on Windows or `make` on Linux)
+
+## Participate
+If you want to modernize some code within DasherCore or add UI features to the DasherUI repository, feel free to send a pull request!

README.md

@@ -4,6 +4,8 @@
 #include "DasherUIScreen.h"
 #include "imgui.h"
 #include "imgui_internal.h"
+#include <memory>
+
 #include "SocketInput.h"
 
 

src/DasherController.h

@@ -33,7 +33,7 @@ void DasherUIScreen::DrawRectangle(Dasher::screenint x1, Dasher::screenint y1, D
 
 	if(iThickness > 0)
 	{
-		const Dasher::CColourIO::ColourInfo::PaletteColor OutlineColor = this->pColorScheme->Colors[Colour];
+		const Dasher::CColourIO::ColourInfo::PaletteColor OutlineColor = this->pColorScheme->Colors[iOutlineColour > 0 ? iOutlineColour : 3]; //Apparently Outline Color 3 is the default
 		const ImVec4 ImOutlineColor = { static_cast<float>(OutlineColor.Red) / 255.0f, static_cast<float>(OutlineColor.Green) / 255.0f, static_cast<float>(OutlineColor.Blue) / 255.0f, 1.0f };
 
 		ImGui::GetWindowDrawList()->AddRect(CanvasPos + p1, CanvasPos + p2, ImGui::ColorConvertFloat4ToU32(ImOutlineColor),0,0, static_cast<float>(iThickness));
@@ -49,7 +49,7 @@ void DasherUIScreen::DrawCircle(Dasher::screenint iCX, Dasher::screenint iCY, Da
 
 	if (iLineWidth > 0)
 	{
-		const Dasher::CColourIO::ColourInfo::PaletteColor OutlineColor = this->pColorScheme->Colors[iLineColour];
+		const Dasher::CColourIO::ColourInfo::PaletteColor OutlineColor = this->pColorScheme->Colors[iLineColour > 0 ? iLineColour : 3];
 		const ImVec4 ImOutlineColor = { static_cast<float>(OutlineColor.Red) / 255.0f, static_cast<float>(OutlineColor.Green) / 255.0f, static_cast<float>(OutlineColor.Blue) / 255.0f, 1.0f };
 
 		ImGui::GetWindowDrawList()->AddCircle(CanvasPos + ImVec2(static_cast<float>(iCX), static_cast<float>(iCY)), static_cast<float>(iR), ImGui::ColorConvertFloat4ToU32(ImFillColor),0, static_cast<float>(iLineWidth));

src/DasherUIScreen.cpp

@@ -97,7 +97,7 @@ void SocketInput::stopListen()
 {
 	keepListenServerAlive = false;
 	keepReadThreadAlive = false;
-	session_acceptor->close();
-	open_socket->close();
-	receiveThread.join();
+	if(session_acceptor) session_acceptor->close();
+	if(open_socket) open_socket->close();
+	if(receiveThread.joinable()) receiveThread.join();
 }

src/SocketInput.cpp

@@ -16,7 +16,6 @@ class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFil
     void startListen();
     void stopListen();
 
-    bool GetSettings(SModuleSettings** sets, int* iCount) override;
 private:
     bool relativeMode;
 	double lastRelativeX = 0.5;