New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sway workspaces #191

Open

mildred wants to merge 5 commits into nwg-piotr:master from mildred:sway-workspaces

Contributor

mildred commented Mar 13, 2023

Fixes #189 and #190

Contributor Author

mildred commented Mar 13, 2023

This is implemented on top of #188 ... if #188 is not merged, then I'll rebase to remove unwanted commits

mildred marked this pull request as ready for review

March 13, 2023 18:24

mildred mentioned this pull request

continuous executor #188

Open

mildred added 5 commits

March 13, 2023 19:25


          Executor: split using shell syntax

05bac01


          Implement continuous executor

ee8271c


          Implement executor config throuh GUI

0f20063


          Implement Sway workspaces config though GUI

e3fc32a


          [sway-workspaces] Improvement of dynamic workspaces

de94b6b

- sort workspaces number from sway to show them in correct order
- fix configuration interface
- handle workspaces labels in config
- handle workspaces labels from sway if not defined in config

mildred force-pushed the sway-workspaces branch from 86eddfe to de94b6b Compare

March 13, 2023 18:27

mildred mentioned this pull request

Fix tray pixmap icon #193

Merged

cinghiopinghio commented Mar 16, 2023

It works for me.

With this config:

    "sway-workspaces": {
      "numbers": [],
      "custom-labels": [
        "O"
      ],
      "focused-labels": [
        "X"
      ],
      "show-icon": true,
      "image-size": 16,
      "show-name": true,
      "name-length": 40,
      "mark-autotiling": true,
      "mark-content": true,
      "show-layout": true,
      "angle": 0.0
    },

I have this:

nwg-piotr mentioned this pull request

Enable pango markup for sway workspace labels #203

Merged

moetayuko reviewed

View reviewed changes

nwg_panel/modules/sway_workspaces.py

+                      if num in self.settings["numbers"]:
+                          config_idx = self.settings["numbers"].index(num)
+                      elif len(self.settings["numbers"]) == 0:
+                          config_idx = num - 1

Contributor

moetayuko Apr 25, 2023 •

edited

Loading

settings["numbers"] is stored as a list of str, int-based lookup fails here

moetayuko reviewed

View reviewed changes

nwg_panel/modules/sway_workspaces.py

+                          text = labels[config_idx]
+                      elif labels and len(labels) == 1:
+                          text = labels[0]
+                      elif idx in range(len(ws_defs)):

Contributor

moetayuko Apr 25, 2023

default value of ws_defs is None, which has no len()

moetayuko reviewed

View reviewed changes

nwg_panel/modules/sway_workspaces.py

+                          ws_num, win_name, win_id, non_empty, win_layout, numbers, ws_defs = self.find_details()
+                          custom_labels = self.settings["custom-labels"]
+                          focused_labels = self.settings["focused-labels"]

Contributor

moetayuko Apr 25, 2023

not accessed

moetayuko reviewed

View reviewed changes

nwg_panel/modules/sway_workspaces.py

+                          ws_num, win_name, win_id, non_empty, win_layout, numbers, ws_defs = self.find_details()
+                          custom_labels = self.settings["custom-labels"]
+                          focused_labels = self.settings["focused-labels"]
                           if len(self.settings["numbers"]) > 0:
                               numbers = self.settings["numbers"]

Contributor

moetayuko Apr 25, 2023

if numbers is set in config, it's not guaranteed to match ws_defs

Owner

nwg-piotr commented Apr 25, 2023

Thank you, @moetayuko

moetayuko reviewed

View reviewed changes

nwg_panel/modules/sway_workspaces.py

Comment on lines +128 to +131

+                      if focused:
+                          labels = self.settings["focused-labels"]
+                      else:
+                          labels = self.settings["custom-labels"]

Contributor

moetayuko Apr 25, 2023

previously it fallbacks to custom-labels if focused-labels not defined, need to implement this as well.

Contributor

moetayuko commented Apr 25, 2023 •

edited

Loading

split from #188 and rebased on master at https://github.com/MoetaYuko/nwg-panel/tree/sway-workspaces, and addressed the issues I commented above. please test if its behavior is still desired.

I noticed the following issues with both my rebased branch and @mildred 's original branch

gray vertical line beside hidden labels
The order is still incorrect if numbers are not specified in config (so that labels are not populated in build_box).

    "sway-workspaces": {
      "numbers": [],
      "custom-labels": [],
      "focused-labels": [],
      "hide-empty": true,
      "hide-other-outputs": true
    },

in the following example, 368 are non-empty at nwg-panel start time so they occur first, 14 are switched to later so they come after 368, which is undesired. need to reimplement the mapping between ws number and gtk.label

Owner

nwg-piotr commented Apr 25, 2023

please test if its behavior is still desired

I don't use this module in real life, and the code contains some contributed changes not always in line with my original concept. It would be better if further changes would be discussed by real life users.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet