Skip to content

Commit eba9107

Browse files
committed
Change from kwin_wayland_wrapper to directly kwin_wayland
1 parent 9bf7af1 commit eba9107

6 files changed

Lines changed: 20 additions & 41 deletions

File tree

biglinux-livecd/usr/bin/startbiglive

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ else
7272
export XDG_CURRENT_DESKTOP=KDE
7373
export QT_SCALE_FACTOR_ROUNDING_POLICY=RoundPreferFloor
7474
systemctl --user start plasma-kglobalaccel.service
75-
dbus-run-session kwin_wayland_wrapper --drm --no-lockscreen --xwayland 'python /usr/share/biglinux/livecd/main.py'
75+
dbus-run-session kwin_wayland --drm --no-lockscreen --xwayland 'python /usr/share/biglinux/livecd/main.py'
7676
elif [[ $display_manager == "gdm" ]]; then
7777
export DESKTOP_SESSION=gnome
7878
export XDG_SESSION_DESKTOP=gnome

biglinux-livecd/usr/share/biglinux/livecd/ui/app_window.py

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,25 @@ def __init__(self, system_service: SystemService, **kwargs):
3434
self.config = SetupConfig()
3535
self.completed_steps = set() # Track completed steps
3636
self.set_title(_("BigLinux Setup"))
37-
self.fullscreen()
37+
38+
# --- Fullscreen for Xorg without compositor ---
39+
# This approach makes the window undecorated and sized to the monitor.
40+
# It's more reliable in environments without a full-featured window manager.
41+
self.set_decorated(False)
42+
display = Gdk.Display.get_default()
43+
if display:
44+
monitors = display.get_monitors()
45+
if monitors.get_n_items() > 0:
46+
# Use the first monitor as the target
47+
monitor = monitors.get_item(0)
48+
geometry = monitor.get_geometry()
49+
self.set_default_size(geometry.width, geometry.height)
50+
else:
51+
# Fallback to the standard method if we can't get monitor info
52+
self.fullscreen()
53+
else:
54+
self.fullscreen()
55+
3856

3957
style_manager = Adw.StyleManager.get_default()
4058
style_manager.set_color_scheme(Adw.ColorScheme.FORCE_DARK)
@@ -164,12 +182,6 @@ def _add_step_button(self, box, step_info):
164182
button.connect("clicked", self._on_step_button_clicked, step_info["name"])
165183
button.add_css_class("flat")
166184

167-
try:
168-
cursor = Gdk.Cursor.new_from_name("pointer", None)
169-
button.set_cursor(cursor)
170-
except Exception:
171-
pass
172-
173185
step_info["button"] = button
174186
if step_info["name"] == "language":
175187
step_info["img"] = img

biglinux-livecd/usr/share/biglinux/livecd/ui/desktop_view.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ def create_item_gobject(self, name: str) -> GObject.Object:
3838
def create_item_widget(self, item: DesktopListItem):
3939
box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
4040
box.set_can_focus(True)
41-
try:
42-
cursor = Gdk.Cursor.new_from_name("pointer", None)
43-
box.set_cursor(cursor)
44-
except Exception:
45-
pass
4641

4742
if os.path.exists(item.image_path):
4843
try:

biglinux-livecd/usr/share/biglinux/livecd/ui/keyboard_view.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,6 @@ def _create_layout_child(self, name, layout_id):
132132
css_classes=["keyboard-item-card"],
133133
)
134134

135-
try:
136-
cursor = Gdk.Cursor.new_from_name("pointer", None)
137-
box.set_cursor(cursor)
138-
except Exception:
139-
pass
140-
141135
label = Gtk.Label(label=name)
142136
label.add_css_class("title-2")
143137
box.append(label)

biglinux-livecd/usr/share/biglinux/livecd/ui/language_view.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,6 @@ def _on_factory_setup(self, factory, list_item):
186186
root_box.append(content_box)
187187
list_item.set_child(root_box)
188188

189-
try:
190-
cursor = Gdk.Cursor.new_from_name("pointer", None)
191-
root_box.set_cursor(cursor)
192-
except Exception:
193-
pass
194-
195189
motion_controller = Gtk.EventControllerMotion.new()
196190
motion_controller.connect("motion", self._on_mouse_motion_item, list_item)
197191
root_box.add_controller(motion_controller)

biglinux-livecd/usr/share/biglinux/livecd/ui/theme_view.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,6 @@ def _retranslate_ui(self):
106106

107107
def _create_jamesdsp_card(self, parent_box):
108108
audio_card = Gtk.Box(css_classes=["settings-card"])
109-
try:
110-
cursor = Gdk.Cursor.new_from_name("pointer", None)
111-
audio_card.set_cursor(cursor)
112-
except Exception:
113-
pass
114109
parent_box.append(audio_card)
115110

116111
content = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=15)
@@ -148,11 +143,6 @@ def _create_jamesdsp_card(self, parent_box):
148143

149144
def _create_contrast_card(self, parent_box):
150145
contrast_card = Gtk.Box(css_classes=["settings-card"])
151-
try:
152-
cursor = Gdk.Cursor.new_from_name("pointer", None)
153-
contrast_card.set_cursor(cursor)
154-
except Exception:
155-
pass
156146
parent_box.append(contrast_card)
157147

158148
content = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=15)
@@ -214,12 +204,6 @@ def create_item_widget(self, item: ThemeListItem):
214204
outer_box.set_hexpand(True)
215205
outer_box.set_vexpand(True)
216206

217-
try:
218-
cursor = Gdk.Cursor.new_from_name("pointer", None)
219-
outer_box.set_cursor(cursor)
220-
except Exception:
221-
pass
222-
223207
if os.path.exists(item.image_path):
224208
try:
225209
pixbuf = GdkPixbuf.Pixbuf.new_from_file(item.image_path)

0 commit comments

Comments
 (0)