mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
Backport 99bfe20120
.
This commit is contained in:
parent
cb848bbcd0
commit
7b431ff0ba
@ -1248,7 +1248,10 @@ Inset * BufferView::editedInset(string const & name) const
|
||||
|
||||
void BufferView::editInset(string const & name, Inset * inset)
|
||||
{
|
||||
d->edited_insets_[name] = inset;
|
||||
if (inset)
|
||||
d->edited_insets_[name] = inset;
|
||||
else
|
||||
d->edited_insets_.erase(name);
|
||||
}
|
||||
|
||||
|
||||
|
@ -4559,7 +4559,7 @@ void GuiView::doShowDialog(QString const & qname, QString const & qdata,
|
||||
if (dialog) {
|
||||
bool const visible = dialog->isVisibleView();
|
||||
dialog->showData(data);
|
||||
if (inset && currentBufferView())
|
||||
if (currentBufferView())
|
||||
currentBufferView()->editInset(name, inset);
|
||||
// We only set the focus to the new dialog if it was not yet
|
||||
// visible in order not to change the existing previous behaviour
|
||||
|
@ -37,6 +37,8 @@ What's new
|
||||
- Add "Reset" and "Restore Defaults" buttons to Text Properties
|
||||
dialog (bug 11415).
|
||||
|
||||
- Insert new graphics inset on the correct cursor position.
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user