Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cosmic-settings/src/pages/input/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pub enum Message {
DisableWhileTyping(bool, bool),
PrimaryButtonSelected(cosmic::widget::segmented_button::Entity, bool),
SetAcceleration(bool, bool),
SetMiddleButtonEmulation(bool, bool),
SetMouseSpeed(f64, bool),
SetNaturalScroll(bool, bool),
SetSecondaryClickBehavior(Option<ClickMethod>, bool),
Expand Down Expand Up @@ -123,6 +124,12 @@ impl Page {
});
}

Message::SetMiddleButtonEmulation(enabled, touchpad) => {
self.update_input(touchpad, |conf| {
conf.middle_button_emulation = Some(enabled);
});
},

Message::SetNaturalScroll(enabled, touchpad) => self.update_input(touchpad, |x| {
x.scroll_config
.get_or_insert(ScrollConfig::default())
Expand Down
13 changes: 13 additions & 0 deletions cosmic-settings/src/pages/input/mouse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ fn mouse() -> Section<crate::pages::Message> {
let mouse_speed = descriptions.insert(fl!("mouse", "speed"));
let primary_button = descriptions.insert(fl!("primary-button"));
let acceleration_desc = descriptions.insert(fl!("acceleration-desc"));
let middle_button_emulation = descriptions.insert(fl!("middle-button-emulation"));
let middle_button_emulation_desc = descriptions.insert(fl!("middle-button-emulation-desc"));

Section::default()
.descriptions(descriptions)
Expand Down Expand Up @@ -110,6 +112,17 @@ fn mouse() -> Section<crate::pages::Message> {
|x| Message::SetAcceleration(x, false),
),
)
.add(
settings::item::builder(&descriptions[middle_button_emulation])
.description(&descriptions[middle_button_emulation_desc])
.toggler(
input
.input_default
.middle_button_emulation
.unwrap_or(false),
|x| Message::SetMiddleButtonEmulation(x, false),
),
)
.apply(Element::from)
.map(crate::pages::Message::Input)
})
Expand Down
12 changes: 12 additions & 0 deletions cosmic-settings/src/pages/input/touchpad.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ fn click_behavior() -> Section<crate::pages::Message> {
let button_areas = descriptions.insert(fl!("click-behavior", "button-areas"));
let tap_to_click = descriptions.insert(fl!("tap-to-click"));
let _tap_to_click_desc = descriptions.insert(fl!("tap-to-click", "desc"));
let middle_button_emulation = descriptions.insert(fl!("middle-button-emulation"));
let middle_button_emulation_desc = descriptions.insert(fl!("middle-button-emulation-desc"));

Section::default()
.title(fl!("click-behavior"))
Expand Down Expand Up @@ -197,6 +199,16 @@ fn click_behavior() -> Section<crate::pages::Message> {
Message::TapToClick,
),
)
.add(
settings::item::builder(&descriptions[middle_button_emulation])
.description(&descriptions[middle_button_emulation_desc])
.toggler(
page.input_touchpad
.middle_button_emulation
.unwrap_or(false),
|x| Message::SetMiddleButtonEmulation(x, false),
),
)
.apply(Element::from)
.map(crate::pages::Message::Input)
})
Expand Down
3 changes: 3 additions & 0 deletions i18n/en/cosmic_settings.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,9 @@ disable-while-typing = Disable while typing
input-devices = Input Devices
.desc = Input Devices

middle-button-emulation = Enable middle button emulation
middle-button-emulation-desc = Emulates a middle button click when pressing the left and right buttons simultaneously.

primary-button = Primary button
.desc = Sets the order of physical buttons.
.left = Left
Expand Down