✨ feat(switcher): adapt window preview size to screen dimensions and reduce button border radius
This commit is contained in:
1 parent
15d9da030c
commit
daa10ca870
2 files changed
+18
-6
No files matched your search
+17
-4
@@ -10,6 +10,7 @@ from fabric.widgets.eventbox import EventBox
|
|||||||
from fabric.widgets.image import Image
|
from fabric.widgets.image import Image
|
||||||
from fabric.widgets.label import Label
|
from fabric.widgets.label import Label
|
||||||
from utils.icon_resolver import IconResolver
|
from utils.icon_resolver import IconResolver
|
||||||
|
from utils.occlusion import get_screen_dimensions
|
||||||
from widgets.wayland import WaylandWindow as Window
|
from widgets.wayland import WaylandWindow as Window
|
||||||
|
|
||||||
gi.require_version("Glace", "0.1")
|
gi.require_version("Glace", "0.1")
|
||||||
@@ -38,7 +39,14 @@ class ApplicationSwitcher(Window):
|
|||||||
|
|
||||||
# Initialize Glace manager for window previews
|
# Initialize Glace manager for window previews
|
||||||
self._manager = Glace.Manager()
|
self._manager = Glace.Manager()
|
||||||
self.preview_size = [150, 100] # Preview size for each window in switcher
|
|
||||||
|
# Calculate preview size based on screen ratio
|
||||||
|
# Formula: screen_ratio = a:b, width = x, height = (x*b)/a
|
||||||
|
screen_width, screen_height = get_screen_dimensions()
|
||||||
|
preview_width = 150 # Base width
|
||||||
|
preview_height = int((preview_width * screen_height) / screen_width)
|
||||||
|
self.preview_size = [preview_width, preview_height]
|
||||||
|
|
||||||
self.glace_clients = {} # Map window addresses to Glace clients
|
self.glace_clients = {} # Map window addresses to Glace clients
|
||||||
self.window_previews = {} # Map window addresses to preview images
|
self.window_previews = {} # Map window addresses to preview images
|
||||||
|
|
||||||
@@ -113,8 +121,12 @@ class ApplicationSwitcher(Window):
|
|||||||
client_app_id = client.get_app_id()
|
client_app_id = client.get_app_id()
|
||||||
client_title = client.get_title()
|
client_title = client.get_title()
|
||||||
|
|
||||||
if (client_app_id and client_app_id.lower() == window_class and
|
if (
|
||||||
client_title and client_title == window_title):
|
client_app_id
|
||||||
|
and client_app_id.lower() == window_class
|
||||||
|
and client_title
|
||||||
|
and client_title == window_title
|
||||||
|
):
|
||||||
return client
|
return client
|
||||||
except Exception:
|
except Exception:
|
||||||
continue
|
continue
|
||||||
@@ -141,12 +153,13 @@ class ApplicationSwitcher(Window):
|
|||||||
preview_image = Image()
|
preview_image = Image()
|
||||||
|
|
||||||
if glace_client:
|
if glace_client:
|
||||||
|
|
||||||
def capture_callback(pbuf, _):
|
def capture_callback(pbuf, _):
|
||||||
try:
|
try:
|
||||||
scaled_pixbuf = pbuf.scale_simple(
|
scaled_pixbuf = pbuf.scale_simple(
|
||||||
self.preview_size[0],
|
self.preview_size[0],
|
||||||
self.preview_size[1],
|
self.preview_size[1],
|
||||||
2 # GdkPixbuf.InterpType.BILINEAR
|
2, # GdkPixbuf.InterpType.BILINEAR
|
||||||
)
|
)
|
||||||
preview_image.set_from_pixbuf(scaled_pixbuf)
|
preview_image.set_from_pixbuf(scaled_pixbuf)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
+1
-2
@@ -11,12 +11,11 @@
|
|||||||
#switcher-button {
|
#switcher-button {
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
min-width: 100px;
|
min-width: 100px;
|
||||||
border-radius: 16px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#window-button {
|
#window-button {
|
||||||
background-color: var(--surface);
|
background-color: var(--surface);
|
||||||
border-radius: 16px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#switcher-button:hover {
|
#switcher-button:hover {
|
||||||
|
|||||||
Reference in new issue
Block a user