hasufell/pnmixer-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blubb

Browse Source
This commit is contained in:
Julian Ospald 2017-07-07 01:00:17 +02:00
parent ca28ad51ed
commit cd89d5f608
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app_state.rs
View File

@ -248,8 +248,7 @@ impl PrefsDialog {
let behavior_prefs = BehaviorPrefs { let behavior_prefs = BehaviorPrefs {
vol_control_cmd, vol_control_cmd,
vol_scroll_step: self.scroll_step_spin.get_value(), vol_scroll_step: self.scroll_step_spin.get_value(),
middle_click_action: From::from(self.middle_click_combo middle_click_action: self.middle_click_combo.get_active().into(),
.get_active()),
custom_command, custom_command,
}; };

8
src/prefs.rs
View File

@ -39,15 +39,15 @@ impl From<i32> for MiddleClickAction {
1 => MiddleClickAction::ShowPreferences, 1 => MiddleClickAction::ShowPreferences,
2 => MiddleClickAction::VolumeControl, 2 => MiddleClickAction::VolumeControl,
3 => MiddleClickAction::CustomCommand, 3 => MiddleClickAction::CustomCommand,
_ => Default::default(), _ => MiddleClickAction::ToggleMute,
} }
} }
} }
impl Into<i32> for MiddleClickAction { impl From<MiddleClickAction> for i32 {
fn into(self) -> i32 { fn from(action: MiddleClickAction) -> Self {
match self { match action {
MiddleClickAction::ToggleMute => 0, MiddleClickAction::ToggleMute => 0,
MiddleClickAction::ShowPreferences => 1, MiddleClickAction::ShowPreferences => 1,
MiddleClickAction::VolumeControl => 2, MiddleClickAction::VolumeControl => 2,