Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git
Remove pinned_border_opacity parameter from compositor config and styling
src/server/config.rs | 7 -------
src/server/window_manager.rs | 7 +++----
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/server/config.rs b/src/server/config.rs
index 8e8da2a..12df8fe 100644
--- a/src/server/config.rs
+++ b/src/server/config.rs
@@ -36,7 +36,6 @@ pub struct Layout {
pub pinned_width: i32,
pub pinned_position: String,
pub pinned_border_gap: i32,
- pub pinned_border_opacity: i32,
pub status_normal_color: String,
pub desktop_background: String,
pub transparency_opacity: f32,
@@ -78,7 +77,6 @@ impl Default for Layout {
pinned_width: 360,
pinned_position: "left".to_string(),
pinned_border_gap: 0,
- pinned_border_opacity: 100,
status_normal_color: "#ccccd8".to_string(),
desktop_background: "#000000".to_string(),
transparency_opacity: 0.9,
@@ -350,8 +348,6 @@ pub struct LayoutConfig {
pub pinned_position: String,
#[serde(default = "default_pinned_border_gap", alias = "side_panel_border_gap")]
pub pinned_border_gap: i64,
- #[serde(default = "default_pinned_border_opacity", alias = "side_panel_border_opacity")]
- pub pinned_border_opacity: i64,
#[serde(default = "default_status_normal_color")]
pub status_normal_color: String,
#[serde(default = "default_window_opacity")]
@@ -384,7 +380,6 @@ impl Default for LayoutConfig {
pinned_width: default_pinned_width(),
pinned_position: default_pinned_position(),
pinned_border_gap: default_pinned_border_gap(),
- pinned_border_opacity: default_pinned_border_opacity(),
status_normal_color: default_status_normal_color(),
window_opacity: default_window_opacity(),
}
@@ -414,7 +409,6 @@ fn default_pinned_behavior() -> String { "inline".to_string() }
fn default_pinned_width() -> i64 { 360 }
fn default_pinned_position() -> String { "left".to_string() }
fn default_pinned_border_gap() -> i64 { 0 }
-fn default_pinned_border_opacity() -> i64 { 100 }
fn default_status_normal_color() -> String { "#ccccd8".to_string() }
fn default_window_opacity() -> bool { true }
@@ -759,7 +753,6 @@ pub fn parse_config(path: &str, state: &mut crate::window_manager::WindowManager
state.layout.pinned_width = config.layout.pinned_width as i32;
state.layout.pinned_position = config.layout.pinned_position;
state.layout.pinned_border_gap = config.layout.pinned_border_gap as i32;
- state.layout.pinned_border_opacity = config.layout.pinned_border_opacity as i32;
state.layout.status_normal_color = config.layout.status_normal_color.clone();
state.layout.transparency_opacity = config.transparency.as_ref().and_then(|t| t.opacity).unwrap_or(0.9) as f32;
state.layout.window_opacity = config.layout.window_opacity;
diff --git a/src/server/window_manager.rs b/src/server/window_manager.rs
index 333747a..433db25 100644
--- a/src/server/window_manager.rs
+++ b/src/server/window_manager.rs
@@ -1011,6 +1011,7 @@ fn get_closest_tag(x: f64, y: f64) -> i32 {
(*win_ptr).scale = 1.0;
ffi::wlr_scene_node_set_enabled((*win_ptr).tree as *mut ffi::wlr_scene_node, true);
(*win_ptr).rendering_requested.hidden = false;
+ (*win_ptr).rendering_requested.blur = self.layout.window_blur;
continue;
}
@@ -1102,12 +1103,11 @@ fn get_closest_tag(x: f64, y: f64) -> i32 {
};
(*win_ptr).wm_requested.tiled = 1 | 2 | 4 | 8;
- let opacity_factor = if !self.layout.window_opacity { 1.0f32 } else { self.layout.pinned_border_opacity as f32 / 100.0 };
let is_focused = win_ptr == focused_window;
let r = self.layout.border_r;
let g_color = self.layout.border_g;
let b = self.layout.border_b;
- let a = (self.layout.border_a as f32 * opacity_factor) as u32;
+ let a = self.layout.border_a;
(*win_ptr).rendering_requested.border = crate::window::Border {
edges: crate::window::Edges { top: true, bottom: true, left: true, right: true },
@@ -1119,7 +1119,7 @@ fn get_closest_tag(x: f64, y: f64) -> i32 {
};
(*win_ptr).rendering_requested.blur = self.layout.window_blur;
(*win_ptr).rendering_requested.opacity = if is_focused { 1.0f32 } else {
- if !self.layout.window_opacity { 1.0f32 } else { 0.85f32 * opacity_factor }
+ if !self.layout.window_opacity { 1.0f32 } else { 0.85f32 }
};
} else {
normal_windows.push(win_ptr);
@@ -2205,7 +2205,6 @@ fn get_closest_tag(x: f64, y: f64) -> i32 {
"side_panel_behavior" | "pinned_behavior" => { self.layout.pinned_behavior = val.to_string(); }
"side_panel_position" | "pinned_position" => { self.layout.pinned_position = val.to_string(); }
"side_panel_border_gap" | "pinned_border_gap" => { if let Ok(v) = val.parse::<i32>() { self.layout.pinned_border_gap = v; } }
- "side_panel_border_opacity" | "pinned_border_opacity" => { if let Ok(v) = val.parse::<i32>() { self.layout.pinned_border_opacity = v; } }
_ => return format!("error: unknown layout key: {}\n", key),
}
self.dirty_windowing();