me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Respect TitleBar text color style when drawing

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-07-09 06:27:12 +02:00
parent ef553cd124
commit 1319c25f20
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
graphics/src/widget/pane_grid.rs
View file

@ -9,6 +9,7 @@
//! [`pane_grid` example]: https://github.com/hecrj/iced/tree/0.1/examples/pane_grid //! [`pane_grid` example]: https://github.com/hecrj/iced/tree/0.1/examples/pane_grid
//! [`PaneGrid`]: type.PaneGrid.html //! [`PaneGrid`]: type.PaneGrid.html
use crate::backend::{self, Backend}; use crate::backend::{self, Backend};
use crate::defaults;
use crate::{Primitive, Renderer}; use crate::{Primitive, Renderer};
use iced_native::mouse; use iced_native::mouse;
use iced_native::pane_grid; use iced_native::pane_grid;
@ -197,11 +198,17 @@ where
) -> Self::Output { ) -> Self::Output {
let style = style_sheet.style(); let style = style_sheet.style();
let defaults = Self::Defaults {
text: defaults::Text {
color: style.text_color.unwrap_or(defaults.text.color),
},
};
let background = crate::widget::container::background(bounds, &style); let background = crate::widget::container::background(bounds, &style);
let (title_primitive, _) = text::Renderer::draw( let (title_primitive, _) = text::Renderer::draw(
self, self,
defaults, &defaults,
title_bounds, title_bounds,
title, title,
title_size, title_size,
@ -212,8 +219,12 @@ where
); );
if let Some((controls, controls_layout)) = controls { if let Some((controls, controls_layout)) = controls {
let (controls_primitive, controls_interaction) = let (controls_primitive, controls_interaction) = controls.draw(
controls.draw(self, defaults, controls_layout, cursor_position); self,
&defaults,
controls_layout,
cursor_position,
);
( (
Primitive::Group { Primitive::Group {