commit 28e347b0a65e00501170cea45d4f6963b828abf4
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Tue Jul 19 22:29:57 2016 +0200
Realize inset argument label font before using it
Also fix a few typos in status.22x.
(cherry picked from commit e35110eab7a540deaf8dc52483f1e5a55a773f46)
---
src/insets/InsetCollapsable.cpp | 1 +
status.22x | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 54e813b..4c292cc 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -247,6 +247,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y)
const
FontInfo labelfont = getLabelfont();
labelfont.setColor(labelColor());
+ labelfont.realize(pi.base.font);
pi.pain.buttonText(x, y, buttonLabel(bv), labelfont,
mouse_hover_[&bv]);
} else {
diff --git a/status.22x b/status.22x
index 843173e..c063933 100644
--- a/status.22x
+++ b/status.22x
@@ -54,7 +54,7 @@ What's new
- Make inset-select-all select all cells only in tables.
- Automatically show the review toolbar if the document has tracked changes
- (bug 8738), and related UI imrovements.
+ (bug 8738), and related UI improvements.
- Implement "Dissolve Inset" and "Show Label" context menu items for
arguments (bug 10150).
@@ -110,13 +110,15 @@ What's new
- Fix display of labels in right-to-left languages (bug 10169).
+- Fix button label font of inset arguments when some traits are inherited.
+
- When a counter is stepped, reset recursively all subcounters (bug #10063).
- Fix on screen narrow box when using \width as box width unit (bug 10048).
- Raise GuiView on buffer switch to bring it topmost in multi-window mode.
-- Fix smal typo in Reference dialog (bug 10194).
+- Fix small typo in Reference dialog (bug 10194).
- Fix default location for RPM based hunspell dictionary search (bug 10071 and
10192).
@@ -130,7 +132,7 @@ What's new
- Display the correct column alignment and a better column spacing in AMS
environments (bugs 1861, 9908).
-- Disable properly toggling math diplay in places where it is not
+- Disable properly toggling math display in places where it is not
possible (bug 10033).
- Fix horizontal scrolling feature when inside a collapsable inset
@@ -166,7 +168,7 @@ What's new
- Shortcut preferences: don't forget to trigger the search when it is
initialized with the previous value.
-- Remove extra spacing around button insets (bug 10149).
+- Remove extra spacing around button insets (bug 10149).
- Fix drawing of buttons by enforcing equal left/right spacing (bug 10147).
