cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

overlays/eww: use nixpkgs' but keeping patch

Browse source
This commit is contained in:
LavaDesu 2022-10-04 20:13:47 +07:00
parent fda167b774
commit 4c51e1d6ca
Signed by: cilly
GPG key ID: 6500251E087653C9
2 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
overlays/eww.nix
View file

@ -1,20 +1,6 @@
self: super: { self: super: {
# For https://github.com/elkowar/eww/pull/280
eww = super.eww.overrideAttrs (old: rec { eww = super.eww.overrideAttrs (old: rec {
version = "unstable-fb0e57a";
src = self.fetchFromGitHub {
owner = "elkowar";
repo = "eww";
rev = "fb0e57a0149904e76fb33807a2804d4af82350de";
sha256 = "089rvcswr0wy05fac8xbfrws1qacqi3iialpv8sai7mzlpsw21m0";
};
# Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 ) # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 )
patches = old.patches ++ [ ./patches/eww.patch ]; patches = old.patches ++ [ ./patches/eww.patch ];
cargoSha256 = "1s7rxilqis2nbvjqjp5zarvmr9g6ndcicyx1rilgjv34qwna3mz1";
cargoDeps = self.rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
sha256 = cargoSha256;
};
}); });
} }

27
overlays/patches/eww.patch
View file

@ -1,28 +1,29 @@
diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs
index ec307537407..49c70571d4b 100644 index 16f1f17d063..08d54cbe343 100644
--- a/crates/eww/src/widgets/widget_definitions.rs --- a/crates/eww/src/widgets/widget_definitions.rs
+++ b/crates/eww/src/widgets/widget_definitions.rs +++ b/crates/eww/src/widgets/widget_definitions.rs
@@ -6,7 +6,7 @@ use crate::{ @@ -8,7 +8,7 @@ use crate::{
use anyhow::*; use anyhow::{anyhow, Context, Result};
use codespan_reporting::diagnostic::Severity; use codespan_reporting::diagnostic::Severity;
use eww_shared_util::Spanned; use eww_shared_util::Spanned;
-use gdk::NotifyType; -use gdk::{ModifierType, NotifyType};
+use gdk::{NotifyType, ScrollDirection}; +use gdk::{ModifierType, NotifyType, ScrollDirection};
use gtk::{self, glib, prelude::*};
use itertools::Itertools; use glib::translate::FromGlib;
use once_cell::sync::Lazy; use gtk::{self, glib, prelude::*, DestDefaults, TargetEntry, TargetList};
@@ -523,11 +523,14 @@ fn build_gtk_event_box(bargs: &mut BuilderArgs) -> Result<gtk::EventBox> { @@ -679,11 +679,14 @@ fn build_gtk_event_box(bargs: &mut BuilderArgs) -> Result<gtk::EventBox> {
// @prop onscroll - event to execute when the user scrolls with the mouse over the widget. The placeholder `{}` used in the command will be replaced with either `up` or `down`. // @prop onscroll - event to execute when the user scrolls with the mouse over the widget. The placeholder `{}` used in the command will be replaced with either `up` or `down`.
prop(timeout: as_duration = Duration::from_millis(200), onscroll: as_string) { prop(timeout: as_duration = Duration::from_millis(200), onscroll: as_string) {
gtk_widget.add_events(gdk::EventMask::SCROLL_MASK); gtk_widget.add_events(gdk::EventMask::SCROLL_MASK);
- gtk_widget.add_events(gdk::EventMask::SMOOTH_SCROLL_MASK); - gtk_widget.add_events(gdk::EventMask::SMOOTH_SCROLL_MASK);
connect_single_handler!(gtk_widget, gtk_widget.connect_scroll_event(move |_, evt| { - connect_signal_handler!(gtk_widget, gtk_widget.connect_scroll_event(move |_, evt| {
- let delta = evt.delta().1; - let delta = evt.delta().1;
- if delta != 0f64 { // Ignore the first event https://bugzilla.gnome.org/show_bug.cgi?id=675959 - if delta != 0f64 { // Ignore the first event https://bugzilla.gnome.org/show_bug.cgi?id=675959
- run_command(timeout, &onscroll, if delta < 0f64 { "up" } else { "down" }); - run_command(timeout, &onscroll, &[if delta < 0f64 { "up" } else { "down" }]);
+ connect_single_handler!(gtk_widget, gtk_widget.connect_scroll_event(move |_, evt| {
+ let dir = match evt.direction() { + let dir = match evt.direction() {
+ ScrollDirection::Up => "up", + ScrollDirection::Left => "up",
+ ScrollDirection::Down => "down", + ScrollDirection::Right => "down",
+ _ => "", + _ => "",
+ }; + };
+ if dir != "" { + if dir != "" {