first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+5 -4
View File
@@ -1,8 +1,9 @@
use std::ops::Not;
use galaxyui::{clipboard::ClipboardContent, AppContext};
use settings::{macros::define_settings_group, Setting, SupportedPlatforms, SyncToCloud};
use settings::macros::define_settings_group;
use settings::{RespectUserSyncSetting, Setting, SupportedPlatforms, SyncToCloud};
use galaxyui::clipboard::ClipboardContent;
use galaxyui::AppContext;
define_settings_group!(SelectionSettings, settings: [
copy_on_select: CopyOnSelect {
@@ -89,7 +90,7 @@ impl SelectionSettings {
/// lack this separate clipboard, and so we map middle-click to the normal clipboard on those
/// platforms.
pub fn read_for_middle_click_paste(&self, ctx: &mut AppContext) -> Option<ClipboardContent> {
if cfg!(target_os = "linux") {
if cfg!(any(target_os = "linux", target_os = "freebsd")) {
return self.maybe_read_from_linux_selection_clipboard(ctx);
}
(self