mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 13:17:00 -04:00
Fixed: keyword expanding could hang if there is a keyword that matches "";
Fixed: drop down list now stays open after mouse out the second time it is used; Fixed some typos in comments; Disabled 'check updates' menu item for 0.3.5 release git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@711 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -138,6 +138,7 @@ void DropDownList::show(bool in_place, wxPoint pos, RealRect* rect) {
|
||||
// show
|
||||
if (selected_item == NO_SELECTION && itemCount() > 0) selected_item = 0; // select first item by default
|
||||
mouse_down = false;
|
||||
close_on_mouse_out = false;
|
||||
Window::Show();
|
||||
if (isRoot() && GetParent()->HasCapture()) {
|
||||
// release capture on parent
|
||||
|
||||
@@ -374,6 +374,7 @@ void SetWindow::onUpdateUI(wxUpdateUIEvent& ev) {
|
||||
case ID_FILE_EXPORT_IMAGE: ev.Enable(!!current_panel->selectedCard()); break;
|
||||
case ID_FILE_EXPORT_APPR: ev.Enable(set->game->isMagic()); break;
|
||||
case ID_FILE_EXPORT_MWS: ev.Enable(set->game->isMagic()); break;
|
||||
case ID_FILE_CHECK_UPDATES:ev.Enable(false); break; // no update checking in 0.3.5
|
||||
case ID_FILE_EXIT:
|
||||
// update for ID_FILE_RECENT done for a different id, because ID_FILE_RECENT may not be in the menu yet
|
||||
updateRecentSets();
|
||||
|
||||
@@ -257,7 +257,7 @@ void SymbolPointEditor::onLeftDClick(const Vector2D& pos, wxMouseEvent& ev) {
|
||||
// select the new point
|
||||
selectPoint(act->getNewPoint(), false);
|
||||
selection = SELECTED_POINTS;
|
||||
} else if (hovering == SELECTED_HANDLE && hover_handle.handle == HANDLE_MAIN) { //%%%%%%% ||/&&
|
||||
} else if (hovering == SELECTED_HANDLE && hover_handle.handle == HANDLE_MAIN) {
|
||||
// Delete point
|
||||
selected_points.clear();
|
||||
selectPoint(hover_handle.point, false);
|
||||
|
||||
@@ -1298,15 +1298,6 @@ void TextValueEditor::clearWordListIndicators(RotatedDC& dc) {
|
||||
|
||||
void TextValueEditor::redrawWordListIndicators(bool toggling_dropdown) {
|
||||
redrawSelection(selection_start_i, selection_end_i, dropDownShown() != toggling_dropdown);
|
||||
/*//%%if (isCurrent()) {
|
||||
// Hide caret
|
||||
wxCaret* caret = editor().GetCaret();
|
||||
if (caret->IsVisible()) caret->Hide();
|
||||
}
|
||||
drawWordListIndicators(*editor().overdrawDC(), true);
|
||||
if (isCurrent()) {
|
||||
showCaret();
|
||||
}*/
|
||||
}
|
||||
|
||||
void TextValueEditor::drawWordListIndicators(RotatedDC& dc, bool redrawing) {
|
||||
|
||||
Reference in New Issue
Block a user