anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Andr�'s highlighted browser bug.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5501 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-10-24 15:03:04 +00:00
parent 3776958094
commit cce8004c07
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,10 @@
2002-10-24 Angus Leeming <leeming@lyx.org>
* FormRef.C (updateBrowser): invoke updateHighlight
(updateHighlight): don't select a browser item if there is no
reference selected.
(apply, input): use getString not fl_get_input.
2002-10-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* FormExternal.C (apply):

49
src/frontends/xforms/FormRef.C
View File

@ -136,6 +136,28 @@ void FormRef::update()
}
namespace {
void updateHighlight(FL_OBJECT * browser,
vector<string> const & keys,
string const & ref)
{
vector<string>::const_iterator cit = (ref.empty())
? keys.end()
: find(keys.begin(), keys.end(), ref);
if (cit == keys.end()) {
fl_deselect_browser(browser);
} else {
int const i = static_cast<int>(cit - keys.begin());
fl_set_browser_topline(browser, max(i-5, 1));
fl_select_browser_line(browser, i+1);
}
}
} // namespace anon
void FormRef::updateBrowser(vector<string> const & akeys) const
{
vector<string> keys(akeys);
@ -144,8 +166,11 @@ void FormRef::updateBrowser(vector<string> const & akeys) const
vector<string> browser_keys = getVector(dialog_->browser_refs);
if (browser_keys == keys)
if (browser_keys == keys) {
updateHighlight(dialog_->browser_refs, keys,
getString(dialog_->input_ref));
return;
}
fl_clear_browser(dialog_->browser_refs);
for (vector<string>::const_iterator it = keys.begin();
@ -164,20 +189,8 @@ void FormRef::updateBrowser(vector<string> const & akeys) const
setEnabled(dialog_->browser_refs, true);
setEnabled(dialog_->check_sort, true);
string ref = fl_get_input(dialog_->input_ref);
vector<string>::const_iterator cit = (ref.empty())
? keys.begin()
: find(keys.begin(), keys.end(), ref);
if (cit == keys.end()) {
fl_deselect_browser(dialog_->browser_refs);
} else {
if (ref.empty())
fl_set_input(dialog_->input_ref, cit->c_str());
int const i = static_cast<int>(cit - keys.begin());
fl_set_browser_topline(dialog_->browser_refs, max(i-5, 1));
fl_select_browser_line(dialog_->browser_refs, i+1);
}
updateHighlight(dialog_->browser_refs, keys,
getString(dialog_->input_ref));
}
}
@ -187,8 +200,8 @@ void FormRef::apply()
int const type = fl_get_choice(dialog_->choice_format) - 1;
controller().params().setCmdName(InsetRef::getName(type));
controller().params().setOptions(fl_get_input(dialog_->input_name));
controller().params().setContents(fl_get_input(dialog_->input_ref));
controller().params().setOptions(getString(dialog_->input_name));
controller().params().setContents(getString(dialog_->input_ref));
}
@ -204,7 +217,7 @@ ButtonPolicy::SMInput FormRef::input(FL_OBJECT * ob, long)
at_ref_ = !at_ref_;
if (at_ref_) {
controller().gotoRef(fl_get_input(dialog_->input_ref));
controller().gotoRef(getString(dialog_->input_ref));
} else {
controller().gotoBookmark();
}