Merge pull request #638 from sday-ssc/master

Remove titlebar separator if title_height is 0.

Author: mahkoh

jay-config/src/_private/client.rs

@@ -1006,6 +1006,16 @@ impl ConfigClient {
         show
     }
 
+    pub fn set_show_titles(&self, show: bool) {
+        self.send(&ClientMessage::SetShowTitles { show });
+    }
+
+    pub fn get_show_titles(&self) -> bool {
+        let res = self.send_with_response(&ClientMessage::GetShowTitles);
+        get_response!(res, true, GetShowTitles { show });
+        show
+    }
+
     pub fn set_middle_click_paste_enabled(&self, enabled: bool) {
         self.send(&ClientMessage::SetMiddleClickPasteEnabled { enabled });
     }

jay-config/src/_private/ipc.rs

@@ -801,6 +801,10 @@ pub enum ClientMessage<'a> {
     SeatEnableUnicodeInput {
         seat: Seat,
     },
+    SetShowTitles {
+        show: bool,
+    },
+    GetShowTitles,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -1036,6 +1040,9 @@ pub enum Response {
     SeatGetSimpleImEnabled {
         enabled: bool,
     },
+    GetShowTitles {
+        show: bool,
+    },
 }
 
 #[derive(Serialize, Deserialize, Debug)]

jay-config/src/lib.rs

@@ -336,6 +336,24 @@ pub fn toggle_show_bar() {
     get.set_show_bar(!get.get_show_bar());
 }
 
+/// Sets whether title bars on windows are shown.
+///
+/// The default is `true`.
+pub fn set_show_titles(show: bool) {
+    get!().set_show_titles(show)
+}
+
+/// Returns whether title bars on windows are shown.
+pub fn get_show_titles() -> bool {
+    get!(true).get_show_titles()
+}
+
+/// Toggles whether title bars on windows are shown.
+pub fn toggle_show_titles() {
+    let get = get!();
+    get.set_show_titles(!get.get_show_titles());
+}
+
 /// Sets a callback to run when this config is unloaded.
 ///
 /// Only one callback can be set at a time. If another callback is already set, it will be

src/config/handler.rs

@@ -1381,6 +1381,17 @@ impl ConfigProxyHandler {
         });
     }
 
+    fn handle_set_show_titles(&self, show: bool) {
+        self.state.theme.show_titles.set(show);
+        self.spaces_change();
+    }
+
+    fn handle_get_show_titles(&self) {
+        self.respond(Response::GetShowTitles {
+            show: self.state.theme.show_titles.get(),
+        });
+    }
+
     fn handle_set_show_float_pin_icon(&self, show: bool) {
         self.state.show_pin_icon.set(show);
         for stacked in self.state.root.stacked.iter() {
@@ -3188,6 +3199,8 @@ impl ConfigProxyHandler {
                 .wrn("get_content_type")?,
             ClientMessage::SetShowBar { show } => self.handle_set_show_bar(show),
             ClientMessage::GetShowBar => self.handle_get_show_bar(),
+            ClientMessage::SetShowTitles { show } => self.handle_set_show_titles(show),
+            ClientMessage::GetShowTitles => self.handle_get_show_titles(),
             ClientMessage::SeatFocusHistory { seat, timeline } => self
                 .handle_seat_focus_history(seat, timeline)
                 .wrn("seat_focus_history")?,

src/icons.rs

@@ -49,7 +49,7 @@ pub enum IconsError {
 impl Icons {
     pub fn update_sizes(&self, state: &State) {
         let mut sizes = AHashSet::new();
-        let height = state.theme.sizes.title_height.get();
+        let height = state.theme.title_height();
         for &(scale, _) in &*state.scales.lock() {
             let [size] = scale.pixel_size([height]);
             if size > 0 {
@@ -64,7 +64,7 @@ impl Icons {
     }
 
     pub fn get(&self, state: &State, scale: Scale) -> Option<Rc<SizedIcons>> {
-        let [size] = scale.pixel_size([state.theme.sizes.title_height.get()]);
+        let [size] = scale.pixel_size([state.theme.title_height()]);
         if let Some(icons) = self.icons.get(&size) {
             return icons;
         }

src/it/tests/t0002_window.rs

@@ -21,14 +21,14 @@ async fn test(run: Rc<TestRun>) -> Result<(), TestError> {
     tassert_eq!(window.tl.core.width.get(), 800);
     tassert_eq!(
         window.tl.core.height.get(),
-        600 - 2 * (run.state.theme.sizes.title_height.get() + 1)
+        600 - 2 * run.state.theme.title_plus_underline_height()
     );
 
     tassert_eq!(
         window.tl.server.node_absolute_position(),
         Rect::new_sized(
             0,
-            2 * (run.state.theme.sizes.title_height.get() + 1),
+            2 * run.state.theme.title_plus_underline_height(),
             window.tl.core.width.get(),
             window.tl.core.height.get(),
         )

src/it/tests/t0003_multi_window.rs

@@ -21,7 +21,7 @@ async fn test(run: Rc<TestRun>) -> Result<(), TestError> {
     let window2 = client.create_window().await?;
     window2.map().await?;
 
-    let otop = 2 * (run.state.theme.sizes.title_height.get() + 1);
+    let otop = 2 * run.state.theme.title_plus_underline_height();
     let bw = run.state.theme.sizes.border_width.get();
 
     tassert_eq!(

src/renderer.rs

@@ -501,7 +501,9 @@ impl Renderer<'_> {
         };
         let pos = floating.position.get();
         let theme = &self.state.theme;
-        let th = theme.sizes.title_height.get();
+        let th = theme.title_height();
+        let tpuh = theme.title_plus_underline_height();
+        let tuh = theme.title_underline_height();
         let bw = theme.sizes.border_width.get();
         let bc = theme.colors.border.get();
         let tc = if floating.active.get() {
@@ -524,7 +526,7 @@ impl Renderer<'_> {
         let title = [Rect::new_sized(x + bw, y + bw, pos.width() - 2 * bw, th).unwrap()];
         self.base.fill_boxes(&title, &tc, srgb);
         let title_underline =
-            [Rect::new_sized(x + bw, y + bw + th, pos.width() - 2 * bw, 1).unwrap()];
+            [Rect::new_sized(x + bw, y + bw + th, pos.width() - 2 * bw, tuh).unwrap()];
         self.base.fill_boxes(&title_underline, &uc, srgb);
         let rect = floating.title_rect.get().move_(x, y);
         let bounds = self.base.scale_rect(rect);
@@ -584,9 +586,9 @@ impl Renderer<'_> {
         }
         let body = Rect::new_sized(
             x + bw,
-            y + bw + th + 1,
+            y + bw + tpuh,
             pos.width() - 2 * bw,
-            pos.height() - 2 * bw - th - 1,
+            pos.height() - 2 * bw - tpuh,
         )
         .unwrap();
         let scissor_body = self.base.scale_rect(body);

src/state.rs

@@ -826,7 +826,8 @@ impl State {
         abs_pos: Option<(i32, i32)>,
     ) {
         width += 2 * self.theme.sizes.border_width.get();
-        height += 2 * self.theme.sizes.border_width.get() + self.theme.sizes.title_height.get() + 1;
+        height +=
+            2 * self.theme.sizes.border_width.get() + self.theme.title_plus_underline_height();
         let output = workspace.output.get();
         let output_rect = output.global.pos.get();
         let position = if let Some((mut x1, mut y1)) = abs_pos {
@@ -836,7 +837,7 @@ impl State {
             if y1 > output_rect.y2() {
                 y1 = output_rect.y2();
             }
-            y1 -= self.theme.sizes.border_width.get() + self.theme.sizes.title_height.get() + 1;
+            y1 -= self.theme.sizes.border_width.get() + self.theme.title_plus_underline_height();
             x1 -= self.theme.sizes.border_width.get();
             Rect::new_sized(x1, y1, width, height).unwrap()
         } else {

src/theme.rs

@@ -466,6 +466,7 @@ pub struct Theme {
     pub bar_font: CloneCell<Option<Arc<String>>>,
     pub title_font: CloneCell<Option<Arc<String>>>,
     pub default_font: Arc<String>,
+    pub show_titles: Cell<bool>,
 }
 
 impl Default for Theme {
@@ -478,6 +479,7 @@ impl Default for Theme {
             bar_font: Default::default(),
             title_font: Default::default(),
             default_font,
+            show_titles: Cell::new(true),
         }
     }
 }
@@ -490,4 +492,24 @@ impl Theme {
     pub fn bar_font(&self) -> Arc<String> {
         self.bar_font.get().unwrap_or_else(|| self.font.get())
     }
+
+    pub fn title_height(&self) -> i32 {
+        if self.show_titles.get() {
+            self.sizes.title_height.get()
+        } else {
+            0
+        }
+    }
+
+    pub fn title_underline_height(&self) -> i32 {
+        if self.show_titles.get() { 1 } else { 0 }
+    }
+
+    pub fn title_plus_underline_height(&self) -> i32 {
+        if self.show_titles.get() {
+            self.sizes.title_height.get() + 1
+        } else {
+            0
+        }
+    }
 }