Skip to content

Commit 1930dda

Browse files
committed
Tweaks
1 parent e0f19b2 commit 1930dda

File tree

5 files changed

+57
-22
lines changed

5 files changed

+57
-22
lines changed

modules/bar.py

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def __init__(self, **kwargs):
9595
self.metrics = MetricsSmall()
9696
self.battery = Battery()
9797

98-
self.revealer = Revealer(
98+
self.revealer_right = Revealer(
9999
name="bar-revealer",
100100
transition_type="slide-left",
101101
child_revealed=True,
@@ -110,10 +110,31 @@ def __init__(self, **kwargs):
110110
),
111111
)
112112

113-
self.boxed_revealer = Box(
113+
self.boxed_revealer_right = Box(
114114
name="boxed-revealer",
115115
children=[
116-
self.revealer,
116+
self.revealer_right,
117+
],
118+
)
119+
120+
self.revealer_left = Revealer(
121+
name="bar-revealer",
122+
transition_type="slide-right",
123+
child_revealed=True,
124+
child=Box(
125+
name="bar-revealer-box",
126+
orientation="h",
127+
spacing=4,
128+
children=[
129+
self.weather,
130+
],
131+
),
132+
)
133+
134+
self.boxed_revealer_left = Box(
135+
name="boxed-revealer",
136+
children=[
137+
self.revealer_left,
117138
],
118139
)
119140

@@ -130,15 +151,15 @@ def __init__(self, **kwargs):
130151
self.button_apps,
131152
Box(name="workspaces-container", children=[self.workspaces]),
132153
self.button_overview,
133-
self.weather
154+
self.boxed_revealer_left,
134155
]
135156
),
136157
end_children=Box(
137158
name="end-container",
138159
spacing=4,
139160
orientation="h",
140161
children=[
141-
self.boxed_revealer,
162+
self.boxed_revealer_right,
142163
self.battery,
143164
self.systray,
144165
self.button_tools,

modules/calendar.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import gi
44
import modules.icons as icons
55
from fabric.widgets.label import Label
6+
from fabric.widgets.box import Box
7+
from fabric.widgets.centerbox import CenterBox
68

79
gi.require_version("Gtk", "3.0")
810
from gi.repository import Gtk, GLib
@@ -23,32 +25,36 @@ def __init__(self):
2325
# Dictionary to store built views for each month.
2426
self.month_views = {}
2527

26-
self.header = Gtk.Box(spacing=4, name="header")
27-
self.pack_start(self.header, False, False, 0)
28-
2928
self.prev_month_button = Gtk.Button(
3029
name="prev-month-button",
3130
child=Label(name="month-button-label", markup=icons.chevron_left)
3231
)
3332
self.prev_month_button.connect("clicked", self.on_prev_month_clicked)
34-
self.header.pack_start(self.prev_month_button, False, False, 0)
3533

3634
self.month_label = Gtk.Label(name="month-label")
37-
self.header.pack_start(self.month_label, True, True, 0)
3835

3936
self.next_month_button = Gtk.Button(
4037
name="next-month-button",
4138
child=Label(name="month-button-label", markup=icons.chevron_right)
4239
)
4340
self.next_month_button.connect("clicked", self.on_next_month_clicked)
44-
self.header.pack_start(self.next_month_button, False, False, 0)
41+
42+
self.header = CenterBox(
43+
spacing=4,
44+
name="header",
45+
start_children=[self.prev_month_button],
46+
center_children=[self.month_label,],
47+
end_children=[self.next_month_button],
48+
)
49+
50+
self.add(self.header)
4551

4652
self.weekday_row = Gtk.Box(spacing=4, name="weekday-row")
4753
self.pack_start(self.weekday_row, False, False, 0)
4854

4955
# Create a stack to hold month days views.
5056
self.stack = Gtk.Stack(name="calendar-stack")
51-
self.stack.set_transition_duration(500)
57+
self.stack.set_transition_duration(250)
5258
self.pack_start(self.stack, True, True, 0)
5359

5460
self.update_header()

modules/notch.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ def close_notch(self):
205205

206206
GLib.idle_add(self._show_overview_children, False)
207207

208-
self.bar.revealer.set_reveal_child(True)
208+
self.bar.revealer_right.set_reveal_child(True)
209+
self.bar.revealer_left.set_reveal_child(True)
209210
self.applet_stack.set_transition_duration(0) # Set transition to 0 when closing, though it won't be visible.
210211
self.applet_stack.set_visible_child(self.nhistory)
211212
self._is_notch_open = False # Set notch state to closed
@@ -255,7 +256,8 @@ def open_notch(self, widget):
255256
# Reset the transition duration back to 250 after a short delay.
256257
GLib.timeout_add(10, lambda: [self.stack.set_transition_duration(100), self.applet_stack.set_transition_duration(250)][-1] or False)
257258

258-
self.bar.revealer.set_reveal_child(False)
259+
self.bar.revealer_right.set_reveal_child(False)
260+
self.bar.revealer_left.set_reveal_child(False)
259261
return
260262

261263
# Handle the "dashboard" case
@@ -292,7 +294,8 @@ def open_notch(self, widget):
292294
# Reset the transition duration back to 250 after a short delay.
293295
GLib.timeout_add(10, lambda: [self.stack.set_transition_duration(100), self.applet_stack.set_transition_duration(250)][-1] or False)
294296

295-
self.bar.revealer.set_reveal_child(False)
297+
self.bar.revealer_right.set_reveal_child(False)
298+
self.bar.revealer_left.set_reveal_child(False)
296299
return
297300

298301
# Handle other widgets (launcher, overview, power, tools)
@@ -301,6 +304,7 @@ def open_notch(self, widget):
301304
"overview": self.overview,
302305
"power": self.power,
303306
"tools": self.tools,
307+
"dashboard": self.dashboard, # Add dashboard here to ensure its style class is removed
304308
}
305309
target_widget = widgets.get(widget, self.dashboard)
306310
# If already showing the requested widget, close the notch.
@@ -322,7 +326,8 @@ def open_notch(self, widget):
322326

323327
# Configure according to the requested widget.
324328
if widget in widgets:
325-
self.stack.add_style_class(widget)
329+
if widget != "dashboard": # Avoid adding dashboard class again if switching from bluetooth
330+
self.stack.add_style_class(widget)
326331
self.stack.set_visible_child(widgets[widget])
327332
widgets[widget].add_style_class("open")
328333

@@ -337,9 +342,11 @@ def open_notch(self, widget):
337342
self.stack.set_visible_child(self.dashboard)
338343

339344
if widget == "dashboard" or widget == "overview":
340-
self.bar.revealer.set_reveal_child(False)
345+
self.bar.revealer_right.set_reveal_child(False)
346+
self.bar.revealer_left.set_reveal_child(False)
341347
else:
342-
self.bar.revealer.set_reveal_child(True)
348+
self.bar.revealer_right.set_reveal_child(True)
349+
self.bar.revealer_left.set_reveal_child(True)
343350
self._is_notch_open = True # Set notch state to open
344351

345352
def _show_overview_children(self, show_children):

modules/weather.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ def _fetch_weather_thread(self):
5454
GLib.idle_add(self.label.set_markup, f"{icons.cloud_off} Unavailable")
5555
except Exception as e:
5656
print(f"Error al obtener clima: {e}")
57-
GLib.idle_add(self.label.set_markup, f"{icons.cloud_off} Error")
57+
GLib.idle_add(self.label.set_markup, f"{icons.cloud_off} Error")

styles/calendar.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
background-color: var(--shadow);
33
border-radius: 20px;
44
border: 4px solid var(--surface);
5-
padding: 8px;
5+
padding: 4px;
66
}
77

88
#header {
99
background-color: var(--shadow);
10-
border-radius: 16px;
11-
padding: 0px;
10+
border-radius: 12px;
11+
border: 2px solid var(--surface);
12+
padding: 4px;
1213
}
1314

1415
#weekday-row {

0 commit comments

Comments
 (0)