| ... | @@ -670,10 +670,16 @@ impl State { | ... | @@ -670,10 +670,16 @@ impl State { |
| 670 | node.set_label(format!("{section}, {page}")); | 670 | node.set_label(format!("{section}, {page}")); |
| 671 | } | 671 | } |
| 672 | let header = format!("{section} · {page}"); | 672 | let header = format!("{section} · {page}"); |
| | 673 | // The focused pane's header wears its section's accent, which the strip's colour |
| | 674 | // stands clear of in either appearance. |
| | 675 | let focused = parked.is_none(); |
| | 676 | let ink = if focused { theme.strip } else { theme.text_dim }; |
| 673 | self.ui.open( | 677 | self.ui.open( |
| 674 | "header", | 678 | "header", |
| 675 | Spec { | 679 | Spec { |
| 676 | size: [fill(), px(ui::shell::TOOL)], | 680 | size: [fill(), px(ui::shell::TOOL)], |
| | 681 | fill: focused.then_some(theme.accent), |
| | 682 | radius: self.rounding(), |
| 677 | ..Spec::default() | 683 | ..Spec::default() |
| 678 | }, | 684 | }, |
| 679 | ); | 685 | ); |
| ... | @@ -683,12 +689,13 @@ impl State { | ... | @@ -683,12 +689,13 @@ impl State { |
| 683 | size: [fill(), px(ui::shell::TOOL)], | 689 | size: [fill(), px(ui::shell::TOOL)], |
| 684 | text: Some(&header), | 690 | text: Some(&header), |
| 685 | overflow: Overflow::Ellipsis, | 691 | overflow: Overflow::Ellipsis, |
| 686 | bold: parked.is_none(), | 692 | bold: focused, |
| | 693 | color: focused.then_some(ink), |
| 687 | pad: [4.0, 0.0], | 694 | pad: [4.0, 0.0], |
| 688 | ..Spec::default() | 695 | ..Spec::default() |
| 689 | }, | 696 | }, |
| 690 | ); | 697 | ); |
| 691 | let close = ui::shell::tool_button(&mut self.ui, "close", art::CLOSE, theme.text_dim, None); | 698 | let close = ui::shell::tool_button(&mut self.ui, "close", art::CLOSE, ink, None); |
| 692 | let button = self.ui.id("close"); | 699 | let button = self.ui.id("close"); |
| 693 | name(&mut self.ui, button, "Close Pane"); | 700 | name(&mut self.ui, button, "Close Pane"); |
| 694 | self.ui.close(); | 701 | self.ui.close(); |