small fixes

Author: afwbkbc

GLSMAC_data/default/game/event/game_settings.gls.js

@@ -12,7 +12,17 @@ return {
 	apply: (e) => {
 		let old_settings = [];
 		let settings = e.game.get_settings().global.map;
+		let changes = [];
 		for (c of e.data.changes) {
+			if (c[0] == 'planet_size') {
+				const xy = #split(c[1], 'x');
+				changes :+['size_x', #to_int(xy[0])];
+				changes :+['size_y', #to_int(xy[1])];
+			} else {
+				changes :+c;
+			}
+		}
+		for (c of changes) {
 			const oldv = settings[c[0]]; // TODO: fix deref
 			if (#is_defined(oldv)) { // TODO: support all fields
 				old_settings :+[c[0], oldv];

GLSMAC_data/default/ui/parts/mainmenu/steps/multiplayer_lobby/game_settings.gls.js

@@ -64,7 +64,7 @@ return (i) => {
 			['140x70', 'Large planet'],
 			['180x90', 'Huge planet'],
 		], #to_string(settings.map.size_x) + 'x' + #to_string(settings.map.size_y), (v) => {
-			return v; // TODO
+			return v; // parsed in event
 		});
 
 		make_line('ocean_coverage', 'Ocean Coverage', [

src/gse/builtins/String.cpp

@@ -6,6 +6,7 @@
 #include "gse/callable/Native.h"
 #include "gse/Exception.h"
 #include "gse/value/String.h"
+#include "gse/value/Array.h"
 #include "util/String.h"
 
 namespace gse {
@@ -34,6 +35,22 @@ void String::AddToContext( gc::Space* const gc_space, context::Context* ctx, gse
 		return VALUE( value::String,, text );
 	} ), ep );
 
+	ctx->CreateBuiltin( "split", NATIVE_CALL() {
+		N_EXPECT_ARGS( 2 );
+		N_GETVALUE( text, 0, String );
+		N_GETVALUE( sep, 1, String );
+		if ( sep.size() != 1 ) {
+			GSE_ERROR( EC.INVALID_CALL, "For now splitting is only possible by single character (got: " + sep + ")" );
+		}
+		const auto results = util::String::Split( text, sep[0] );
+		value::array_elements_t elements = {};
+		elements.reserve( results.size() );
+		for ( const auto& result : results ) {
+			elements.push_back( VALUE( value::String,, result ) );
+		}
+		return VALUE( value::Array,, elements );
+	} ), ep );
+
 }
 
 }

src/ui/dom/Button.cpp

@@ -58,6 +58,10 @@ const bool Button::ProcessEventImpl( GSE_CALLABLE, const input::Event& event ) {
 	bool result = false;
 	switch ( event.type ) {
 		case input::EV_MOUSE_DOWN: {
+			if ( m_on_mousedown ) {
+				m_on_mousedown();
+				break;
+			}
 			AddModifier( GSE_CALL, CM_ACTIVE );
 			m_last_button = event.data.mouse.button;
 			result = true;
@@ -71,14 +75,13 @@ const bool Button::ProcessEventImpl( GSE_CALLABLE, const input::Event& event ) {
 				if ( m_on_click ) {
 					// managed by parent
 					m_on_click();
+					break;
 				}
-				else {
-					m_sound->Play();
-					input::Event e;
-					e.SetType( input::EV_CLICK );
-					e.data.mouse = event.data.mouse;
-					ProcessEvent( GSE_CALL, e );
-				}
+				m_sound->Play();
+				input::Event e;
+				e.SetType( input::EV_CLICK );
+				e.data.mouse = event.data.mouse;
+				ProcessEvent( GSE_CALL, e );
 			}
 			m_last_button = input::MB_NONE;
 			result = true;

src/ui/dom/Button.h

@@ -28,6 +28,7 @@ class Button : public Panel {
 private:
 	friend class Select;
 	typedef std::function< void() > f_on_click_t;
+	f_on_click_t m_on_mousedown = nullptr;
 	f_on_click_t m_on_click = nullptr;
 
 };

src/ui/dom/ChoiceList.cpp

@@ -182,7 +182,7 @@ void ChoiceList::SetItems( GSE_CALLABLE, const gse::value::array_elements_t& ite
 			} }
 		).first->second;
 		m_choices_order.push_back( k );
-		element->On( GSE_CALL, "click", NATIVE_CALL( this, choice ) {
+		element->On( GSE_CALL, "mousedown", NATIVE_CALL( this, choice ) {
 			const bool was_actually_changed = !m_selected_choice || m_selected_choice->value != choice.value;
 			if ( was_actually_changed ) {
 				Select( GSE_CALL, choice, true );

src/ui/dom/Select.cpp

@@ -26,7 +26,7 @@ Select::Select( DOM_ARGS )
 
 	m_active_element = new Button( GSE_CALL, ui, this, {} );
 	ForwardProperty( GSE_CALL, "itemclass", "class", m_active_element );
-	m_active_element->m_on_click = [ this, ctx, si, ep ]() {
+	m_active_element->m_on_mousedown = [ this, ctx, si, ep ]() {
 		if ( m_readonly ) {
 			return;
 		}