diff options
author | 2018-11-24 08:59:01 +0100 | |
---|---|---|
committer | 2018-11-24 08:59:01 +0100 | |
commit | d440468d2deb31d311564a5b796608136cf99e49 (patch) | |
tree | 01e58548cb5199ef8a682c8634655aeeef51d0b8 /include | |
parent | Merge pull request #3178 from progandy/sysconfdir (diff) | |
parent | Adding commands for configuring titlebar borders and padding (diff) | |
download | sway-d440468d2deb31d311564a5b796608136cf99e49.tar.gz sway-d440468d2deb31d311564a5b796608136cf99e49.tar.zst sway-d440468d2deb31d311564a5b796608136cf99e49.zip |
Merge pull request #3145 from fdlamotte/master
Adding commands for configuring titlebar borders and padding
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 3 | ||||
-rw-r--r-- | include/sway/tree/container.h | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index b0339313..e6036e51 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -173,6 +173,8 @@ sway_cmd cmd_swaynag_command; | |||
173 | sway_cmd cmd_swap; | 173 | sway_cmd cmd_swap; |
174 | sway_cmd cmd_tiling_drag; | 174 | sway_cmd cmd_tiling_drag; |
175 | sway_cmd cmd_title_format; | 175 | sway_cmd cmd_title_format; |
176 | sway_cmd cmd_titlebar_border_thickness; | ||
177 | sway_cmd cmd_titlebar_padding; | ||
176 | sway_cmd cmd_unmark; | 178 | sway_cmd cmd_unmark; |
177 | sway_cmd cmd_urgent; | 179 | sway_cmd cmd_urgent; |
178 | sway_cmd cmd_workspace; | 180 | sway_cmd cmd_workspace; |
diff --git a/include/sway/config.h b/include/sway/config.h index 4927b8e0..a6920835 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -391,6 +391,9 @@ struct sway_config { | |||
391 | size_t font_height; | 391 | size_t font_height; |
392 | size_t font_baseline; | 392 | size_t font_baseline; |
393 | bool pango_markup; | 393 | bool pango_markup; |
394 | int titlebar_border_thickness; | ||
395 | int titlebar_h_padding; | ||
396 | int titlebar_v_padding; | ||
394 | size_t urgent_timeout; | 397 | size_t urgent_timeout; |
395 | enum sway_fowa focus_on_window_activation; | 398 | enum sway_fowa focus_on_window_activation; |
396 | enum sway_popup_during_fullscreen popup_during_fullscreen; | 399 | enum sway_popup_during_fullscreen popup_during_fullscreen; |
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index f907aad2..1d0a0ad1 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -10,12 +10,6 @@ | |||
10 | struct sway_view; | 10 | struct sway_view; |
11 | struct sway_seat; | 11 | struct sway_seat; |
12 | 12 | ||
13 | #define TITLEBAR_BORDER_THICKNESS 1 | ||
14 | |||
15 | // Padding includes titlebar border | ||
16 | #define TITLEBAR_H_PADDING 3 | ||
17 | #define TITLEBAR_V_PADDING 4 | ||
18 | |||
19 | enum sway_container_layout { | 13 | enum sway_container_layout { |
20 | L_NONE, | 14 | L_NONE, |
21 | L_HORIZ, | 15 | L_HORIZ, |