anufrievroman/waypaper
1
1
Fork 0
mirror of https://github.com/anufrievroman/waypaper.git synced 2024-11-26 00:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from nikolaizombie1/fix-hyprpaper-first-launch

Browse Source 
fix: hyprpaper first launch not setting wallpaper correctly
This commit is contained in:
Roman 2024-05-23 09:20:52 +09:00 committed by GitHub
commit a9006aafa3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
waypaper/app.py
View File

@ -7,6 +7,7 @@ import gi
import shutil
from pathlib import Path
from PIL import Image
import re
from waypaper.aboutdata import AboutData
from waypaper.changer import change_wallpaper
@ -223,10 +224,10 @@ class App(Gtk.Window):
def monitor_option_display(self):
"""Display monitor option if backend is swww or hyprpaper (with swww installed)"""
self.options_box.remove(self.monitor_option_combo)
if self.cf.backend == "swww" or (self.cf.backend == "hyprpaper" and "swww" in self.cf.installed_backends):
# Check available monitors:
monitor_names = ["All"]
if self.cf.backend == "swww":
# Check available monitors:
monitor_names = ["All"]
try:
subprocess.Popen(["swww-daemon"])
query_output = str(subprocess.check_output(["swww", "query"], encoding='utf-8'))
@ -236,16 +237,35 @@ class App(Gtk.Window):
except Exception as e:
print(f"{self.txt.err_disp} {e}")
# Create a monitor option dropdown menu:
self.monitor_option_combo = Gtk.ComboBoxText()
for monitor in monitor_names:
self.monitor_option_combo.append_text(monitor)
self.monitor_option_combo.set_active(0)
self.monitor_option_combo.connect("changed", self.on_monitor_option_changed)
self.monitor_option_combo.set_tooltip_text(self.txt.tip_display)
elif self.cf.backend == "hyprpaper":
try:
# Query hyprctl for motitors
query_output = str(subprocess.check_output(["hyprctl", "monitors"], encoding='utf-8'))
# Get lines from output
query_output = query_output.split('\n')
# Use a regular expression to get the lines that contain the monitor names
query_output = list(filter(lambda line: re.match(r"Monitor [a-zA-Z-0-9]+ \(ID \d+\):", line),query_output))
for line in query_output:
# Append monitor names to monitor_names
monitor_names.append(line.split(' ')[1])
except Exception as e:
print(f"{self.txt.err_disp} {e}")
else:
return
# Create a monitor option dropdown menu:
self.monitor_option_combo = Gtk.ComboBoxText()
for monitor in monitor_names:
self.monitor_option_combo.append_text(monitor)
self.monitor_option_combo.set_active(0)
self.monitor_option_combo.connect("changed", self.on_monitor_option_changed)
self.monitor_option_combo.set_tooltip_text(self.txt.tip_display)
# Add it to the row of buttons:
self.options_box.pack_start(self.monitor_option_combo, False, False, 0)
# Add it to the row of buttons:
self.options_box.pack_start(self.monitor_option_combo, False, False, 0)
def check_backends(self):

7
waypaper/changer.py
View File

@ -84,8 +84,11 @@ def change_wallpaper(image_path, cf, monitor, txt):
# hyprpaper backend:
elif cf.backend == "hyprpaper":
subprocess.Popen(["hyprpaper"])
time.sleep(0.01)
try:
str(subprocess.check_output(["pgrep", "hyprpaper"], encoding='utf-8'))
except Exception:
subprocess.Popen(["hyprpaper"])
time.sleep(1)
preload_command = ["hyprctl", "hyprpaper", "preload", image_path]
if monitor == "All":
monitor = ""