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

Fix UI to branch activation

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8478 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2004-03-05 13:33:56 +00:00
parent f0b5144444
commit 6f4ac88ac8
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2004-03-05 Martin Vermeer <martin.vermeer@hut.fi>
* FormDocument.C: fix user interface to branch activation
2004-02-21 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* FormPreferences.C, forms/form_preferences.fd: remove use_tempdir

23
src/frontends/xforms/FormDocument.C
View File

@ -517,7 +517,6 @@ ButtonPolicy::SMInput FormDocument::input(FL_OBJECT * ob, long)
ob == branch_->button_remove_branch ||
ob == branch_->button_modify ||
ob == branch_->button_select ||
ob == branch_->button_deselect ||
ob == branch_->button_deselect) {
branch_input(ob);
} else if (ob == dialog_->button_save_defaults) {
@ -753,15 +752,23 @@ void FormDocument::branch_input(FL_OBJECT * ob)
} else if (ob == branch_->button_select ||
ob == branch_->button_deselect) {
bool const selected = ob == branch_->button_select;
int const i = fl_get_browser(branch_->browser_all_branches);
string const current_branch =
fl_get_browser_line(branch_->browser_all_branches, i);
bool const selecting = ob == branch_->button_select;
string current_branch;
// When selecting, take highlighted item from left browser,
// when deselecting, from right browser:
if (selecting) {
int const i = fl_get_browser(branch_->browser_all_branches);
current_branch =
fl_get_browser_line(branch_->browser_all_branches, i);
} else {
int const i = fl_get_browser(branch_->browser_selection);
current_branch =
fl_get_browser_line(branch_->browser_selection, i);
}
Branch * branch = branchlist_.find(current_branch);
if (branch && branch->setSelected(selected))
if (branch && branch->setSelected(selecting))
rebuild_selected_branches_browser();
} else if (ob == branch_->button_modify) {