| ... | @@ -157,11 +157,12 @@ impl State { | ... | @@ -157,11 +157,12 @@ impl State { |
| 157 | dim(ui, "hint", "Doesn’t change the notebook’s folder name"); | 157 | dim(ui, "hint", "Doesn’t change the notebook’s folder name"); |
| 158 | } | 158 | } |
| 159 | label(ui, "Color:"); | 159 | label(ui, "Color:"); |
| | 160 | // A notebook without a colour of its own wears the app's. |
| 160 | let shown = dialog.color.or(dialog.library.color()); | 161 | let shown = dialog.color.or(dialog.library.color()); |
| 161 | let named = SECTION_COLORS | 162 | let named = SECTION_COLORS |
| 162 | .iter() | 163 | .iter() |
| 163 | .find(|(color, _)| Some(*color) == shown) | 164 | .find(|(color, _)| Some(*color) == shown) |
| 164 | .map_or("", |(_, name)| name); | 165 | .map_or("Default", |(_, name)| name); |
| 165 | let combo = ui.id("combo"); | 166 | let combo = ui.id("combo"); |
| 166 | ui::shell::combo(ui, "combo", "Color", named, 160.0, colors(), true); | 167 | ui::shell::combo(ui, "combo", "Color", named, 160.0, colors(), true); |
| 167 | let items: Vec<Item> = SECTION_COLORS | 168 | let items: Vec<Item> = SECTION_COLORS |