Allow Wayland to paste using middlemouse button

godotengine · Sep 3, 2024 · e0ed82c · e0ed82c
1 parent e2dd56b
commit e0ed82c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
@@ -261,7 +261,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		}
 
 		if (is_middle_mouse_paste_enabled() && b->is_pressed() && b->get_button_index() == MouseButton::MIDDLE && is_editable() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
-			String paste_buffer = DisplayServer::get_singleton()->clipboard_get_primary().strip_escapes();
+			String paste_buffer = DisplayServer::get_singleton()->clipboard_get().strip_escapes();
 
 			deselect();
 			set_caret_at_pixel_pos(b->get_position().x);

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
@@ -7227,6 +7227,10 @@ void TextEdit::_paste_primary_clipboard_internal(int p_caret) {
 
 	String paste_buffer = DisplayServer::get_singleton()->clipboard_get_primary();
 
+	if (DisplayServer::get_singleton()->get_name() == "Wayland") {
+		paste_buffer = DisplayServer::get_singleton()->clipboard_get();
+	}
+
 	if (get_caret_count() == 1) {
 		Point2i pos = get_line_column_at_pos(get_local_mouse_pos());
 		deselect();