toolkit: comparison ui/winui/table.cpp

-:7e39db525fd9
+:279c0c81d3b1
 #include "../common/object.h"
 #include <winrt/Microsoft.UI.Xaml.Data.h>
 #include <winrt/Microsoft.UI.Xaml.Media.h>
 #include <winrt/Microsoft.UI.Xaml.Input.h>
+#include <winrt/Windows.UI.Core.h>
 using namespace winrt;
 using namespace Microsoft::UI::Xaml;
 using namespace Microsoft::UI::Xaml::Controls;
 using namespace Windows::UI::Xaml::Interop;
 	winrt::Windows::UI::Color selectedBg = { 255, 204, 232, 255 }; // test color
 	selectedBrush = SolidColorBrush(selectedBg);
 	winrt::Windows::UI::Color selectedFg = { 255, 0, 90, 158 }; // test color
 	selectedBorderBrush = SolidColorBrush(selectedFg);
+	grid.KeyDown(
+		winrt::Microsoft::UI::Xaml::Input::KeyEventHandler(
+			[=](IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::KeyRoutedEventArgs const& args) {
+				// key event for hanling the table cursor or enter
+			})
+	);
 }
 void UiTable::add_header(UiModel* model) {
 	GridLength gl;
 	gl.Value = 0;
 			grid.RowDefinitions().Append(rowdef);
 			maxrows = row;
 		}
 		for (int col = 0; col < header.size(); col++) {
+			// create ui elements with the correct cell border
+			// dependeing on the column
 			Border cellBorder = Border();
 			cellBorder.Background(defaultBrush);
 			TextBlock cell = TextBlock();
 			cellBorder.Child(cell);
 			cellBorder.BorderBrush(defaultBrush);
 				cellBorder.BorderThickness(b3);
 			}
 			else {
 				cellBorder.BorderThickness(b2);
 			}
+			Thickness padding = { 10,0,4,0 };
+			cell.Padding(padding);
+			cell.VerticalAlignment(VerticalAlignment::Stretch);
+			// set cell value
 			char* value = (char*)getvalue(elm, col);
 			if (value) {
 				wchar_t* wstr = str2wstr(value, nullptr);
 				cell.Text(winrt::hstring(wstr));
 				free(wstr);
 			}
-			Thickness padding = { 10,0,4,0 };
-			cell.Padding(padding);
-			cell.VerticalAlignment(VerticalAlignment::Stretch);
 			// event handler
 			cellBorder.PointerPressed(
 				winrt::Microsoft::UI::Xaml::Input::PointerEventHandler(
 					[=](IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::PointerRoutedEventArgs const& args) {
-						if (selection > 0) {
+						winrt::Windows::System::VirtualKeyModifiers modifiers = args.KeyModifiers();
-							row_background(selection, defaultBrush, defaultBrush);
-						}
+						if (modifiers == winrt::Windows::System::VirtualKeyModifiers::Control) {
-						row_background(row, selectedBrush, selectedBorderBrush);
+							// add/remove current row
-						selection = row;
+							if (!is_row_selected(row)) {
+								row_background(row, selectedBrush, selectedBorderBrush);
+								selection.push_back(row);
+							}
+							else {
+								row_background(row, highlightBrush, highlightBrush);
+								remove_from_selection(row);
+							}
+						}
+						else if (modifiers == winrt::Windows::System::VirtualKeyModifiers::None || selection.size() == 0) {
+							// no modifier or shift is pressed but there is no selection
+							if (selection.size() > 0) {
+								change_rows_bg(selection, defaultBrush, defaultBrush);
+							}
+							row_background(row, selectedBrush, selectedBorderBrush);
+							selection = { row };
+						}
+						else if (modifiers == winrt::Windows::System::VirtualKeyModifiers::Shift) {
+							// select everything between the first selection and the current row
+							std::sort(selection.begin(), selection.end());
+							int first = selection.front();
+							// clear previous selection
+							change_rows_bg(selection, defaultBrush, defaultBrush);
+							// create new selection
+							std::vector<int> newselection;
+							for (int s = first; s <= row; s++) {
+								newselection.push_back(s);
+							}
+							selection = newselection;
+							change_rows_bg(selection, selectedBrush, selectedBorderBrush);
+						}
 					})
 			);
 			cellBorder.PointerReleased(
 				winrt::Microsoft::UI::Xaml::Input::PointerEventHandler(
 					[=](IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::PointerRoutedEventArgs const& args) {
 					})
 			);
 			cellBorder.PointerEntered(
 				winrt::Microsoft::UI::Xaml::Input::PointerEventHandler(
 					[=](IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::PointerRoutedEventArgs const& args) {
-						if (selection != row) {
+						if (!is_row_selected(row)) {
 							row_background(row, highlightBrush, highlightBrush);
 						}
 					})
 			);
 			cellBorder.PointerExited(
 				winrt::Microsoft::UI::Xaml::Input::PointerEventHandler(
 					[=](IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::PointerRoutedEventArgs const& args) {
-						if (selection != row) {
+						if (!is_row_selected(row)) {
 							row_background(row, defaultBrush, defaultBrush);
 						}
 					})
 			);
 			b.Background(brush);
 			b.BorderBrush(borderBrush);
 		}
 	}
 }
+void UiTable::change_rows_bg(std::vector<int> rows, winrt::Microsoft::UI::Xaml::Media::Brush brush, winrt::Microsoft::UI::Xaml::Media::Brush borderBrush) {
+	std::for_each(rows.cbegin(), rows.cend(), [&](const int& row) {row_background(row, brush, borderBrush); });
+}
+bool UiTable::is_row_selected(int row) {
+	return std::find(selection.begin(), selection.end(), row) != selection.end() ? true : false;
+}
+void UiTable::remove_from_selection(int row) {
+	selection.erase(std::remove(selection.begin(), selection.end(), row), selection.end());
+	selection.shrink_to_fit();
+}

Mercurial > hg > toolkit / file comparison

comparison: ui/winui/table.cpp

ui/winui/table.cpp