mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-18 06:46:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove conditionals and old code for locating and loading icons

Browse source 
With libsfdo a hard dependency we can locate and load icons always,
regardless of whether we have tray or not. Old locating and loading code
can also be removed.
This commit is contained in:
myrslint 2025-07-02 21:59:38 +00:00
parent 0872673472
commit 6d7c0d52d6
10 changed files with 7 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/config.h
View file

@ -399,9 +399,7 @@ struct bar_config {
char *binding_mode_text;
} colors;
#if HAVE_TRAY || HAVE_LIBSFDO
char *icon_theme;
#endif
#if HAVE_TRAY
struct wl_list tray_bindings; // struct tray_binding::link

5
include/sway/server.h
View file

@ -9,9 +9,7 @@
#include "sway/xwayland.h"
#endif
#if HAVE_LIBSFDO
#include "sfdo.h"
#endif
struct sway_transaction;
@ -151,10 +149,7 @@ struct sway_server {
struct wl_event_source *delayed_modeset;
#if HAVE_LIBSFDO
struct sfdo *sfdo;
#endif
};
extern struct sway_server server;

4
include/swaybar/bar.h
View file

@ -16,9 +16,7 @@ struct swaybar_tray;
struct swaybar_workspace;
struct loop;
#if HAVE_LIBSFDO
struct sfdo;
#endif
struct swaybar {
char *id;
@ -54,9 +52,7 @@ struct swaybar {
struct swaybar_tray *tray;
#endif
#if HAVE_LIBSFDO
struct sfdo *sfdo;
#endif
bool running;
};

6
include/swaybar/config.h
View file

@ -8,9 +8,7 @@
#include "util.h"
#include <pango/pangocairo.h>
#if HAVE_LIBSFDO
#include "sfdo.h"
#endif
struct box_colors {
uint32_t border;
@ -77,9 +75,7 @@ struct swaybar_config {
struct box_colors binding_mode;
} colors;
#if HAVE_TRAY || HAVE_LIBSFDO
char *icon_theme;
#endif
#if HAVE_TRAY
struct wl_list tray_bindings; // struct tray_binding::link
@ -88,9 +84,7 @@ struct swaybar_config {
int tray_padding;
#endif
#if HAVE_LIBSFDO
struct sfdo *sfdo;
#endif
};
#if HAVE_TRAY