Added listview

Author: broken-bytes

CMakeLists.txt

@@ -20,6 +20,7 @@ set(SRC_INC
 	include/Window.hxx
 	include/MainWindow.hxx
 	include/ColorPicker.hxx
+	include/DualSenseInfo.hxx
 )
 
 set(SRC
@@ -44,6 +45,7 @@ set(ASSETS "$<TARGET_FILE_DIR:${APP}>/assets")
 
 add_executable(${APP} WIN32 ${SRC} ${SRC_INC})
 target_link_directories(${APP} PUBLIC lib/)
+target_link_libraries(${APP} comctl32.lib)
 target_link_libraries(${APP} hidapi.lib)
 target_link_libraries(${APP} setupapi)
 target_link_libraries(${APP} ViGEmClient.lib)

include/ColorPicker.hxx

@@ -1,22 +1,13 @@
 #pragma once
 
 
-#include "Core.hxx"
-#include "Window.hxx"
 #include <sigslot/signal.hpp>
 
-namespace BrokenBytes::DualSense4Windows::UI {
-
-	struct Color {
-		uint8_t R;
-		uint8_t G;
-		uint8_t B;
+#include "Core.hxx"
+#include "Window.hxx"
+#include "DualSenseInfo.hxx"
 
-		COLORREF RGB_VALUE() const {
-			return RGB(R, G, B);
-		}
-	};
-	
+namespace BrokenBytes::DualSense4Windows::UI {	
 	class ColorPicker : public Window {
 	public:
 		sigslot::signal<Color> ColorChanged;

include/DualSenseInfo.hxx

@@ -0,0 +1,35 @@
+#pragma once
+#include <string>
+#include "Core.hxx"
+
+
+namespace BrokenBytes::DualSense4Windows::UI {
+	struct Color {
+		uint8_t R;
+		uint8_t G;
+		uint8_t B;
+
+		COLORREF RGB_VALUE() const {
+			return RGB(R, G, B);
+		}
+	};
+	
+	enum class ConnectionType {
+		USB,
+		Bluetooth
+	};
+
+	enum class Mode {
+		XBox,
+		DS4,
+		Native
+	};
+	
+	struct DualSenseInfo {
+		char* Path;
+		std::wstring Name;
+		ConnectionType Connection;
+		Mode Mode;
+		Color Color;
+	};
+}

include/MainWindow.hxx

@@ -11,13 +11,13 @@
 namespace BrokenBytes::DualSense4Windows::UI {
 
 	enum class Dimensions : uint16_t {
-		VSpacer = 1,
+		VSpacer = 8,
 		HSpacer = 1,
 		NameWidth = 30,
 		ConnectionWidth = 10,
 		ColorSize = 15,
 		HideWidth = 10,
-		BaseHeight = 5
+		BaseHeight = 16
 	};
 
 	class MainWindow : public Window {
@@ -46,18 +46,14 @@ namespace BrokenBytes::DualSense4Windows::UI {
 
 	private:
 		std::vector<char*> _devices;
-		std::map<char*, std::array<void*, 4>> _controls;
-
-		/// <summary>
-		/// Adds the controls for a given DualSense
-		/// </summary>
-		/// <param name="id">The path of the DualSense</param>
-		void AddControls(char* id);
-
-		/// <summary>
-		/// Removes the controls for a given DualSense
-		/// </summary>
-		/// <param name="id">The path of the DualSense</param>
+		std::vector<DualSenseInfo> _info;
+		HWND _tabView;
+		HWND _listView;
+		std::map<std::wstring, HWND> _tabs;
+		
+		HWND CreateTabControl();
+		HWND CreateListViewControl();
+		void AddControls(char* id, int index);
 		void RemoveControls(char* id);
 	};
 }

include/Window.hxx

@@ -13,6 +13,11 @@
 namespace BrokenBytes::DualSense4Windows::UI {
 	constexpr LPCWSTR WINDOW_DEFAULT = L"WINDOW_DEFAULT";
 
+	constexpr int FONT_TAB = 19;
+	constexpr int FONT_HEADLINE = 23;
+	constexpr int FONT_LABEL = 21;
+	constexpr int FONT_BTN = 22;
+	
 	class Window {
 	public:
 		Window(
@@ -44,8 +49,8 @@ namespace BrokenBytes::DualSense4Windows::UI {
 				GetModuleHandle(nullptr),
 				nullptr
 			);
-			SendMessageW(_handle, WM_THEMECHANGED, 0, 0);
 			SetWindowLongPtr(_handle, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
+			SetFont(Handle(), FONT_HEADLINE);
 
 			if (_handle == nullptr) {
 				return;
@@ -155,6 +160,23 @@ namespace BrokenBytes::DualSense4Windows::UI {
 			_isRegistered = true;
 		}
 
+		/// <summary>
+		/// Sets the default font for the given window
+		/// </summary>
+		/// <param name="handle"></param>
+		void SetFont(HWND handle, int size) {
+			HFONT hFont = CreateFont(size, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET,
+				OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, HIGH_LEVEL,
+				DEFAULT_PITCH | FF_DONTCARE, TEXT("Roboto"));
+			SendMessage(
+				handle,
+				WM_SETFONT,
+				reinterpret_cast<WPARAM>(hFont),
+				true
+			);
+		}
+
+		
 		/// <summary>
 		/// Sets the handle of this Window
 		/// </summary>

src/ColorPicker.cxx

@@ -103,11 +103,11 @@ namespace BrokenBytes::DualSense4Windows::UI {
             NULL);	
 
         SetResizable(false);
-        SetWindowPos(Handle(), HWND_TOPMOST, 0, 0, WIDTH, HEIGHT, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE);
 	}
 
 	void ColorPicker::Show() {
         Window::Show();
+        SetWindowPos(Handle(), HWND_TOPMOST, 0, 0, WIDTH, HEIGHT, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE);
 	}
 
     void ColorPicker::SetColor(uint8_t r, uint8_t g, uint8_t b) {