blur deck combobox after selecting

Classes/gframe/deck_con.cpp

@@ -987,6 +987,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					break;
 				}
 				}
+				mainGame->env->setFocus(0);
 				InstantSearch();
 				break;
 			}
@@ -1004,12 +1005,14 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 						mainGame->ebDefense->setEnabled(true);
 					}
 				}
+				mainGame->env->setFocus(0);
 				InstantSearch();
 				break;
 			}
 			case COMBOBOX_ATTRIBUTE:
 			case COMBOBOX_RACE:
 			case COMBOBOX_LIMIT:
+				mainGame->env->setFocus(0);
 				InstantSearch();
 			}
 		}
@@ -1205,19 +1208,15 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				is_starting_dragging = false;
 			}
 			mouse_pos.set(event.MouseInput.X, event.MouseInput.Y);
-            if(hovered_pos == 4) {
-			    int dragpos = dragy - mouse_pos.Y;
+            if(hovered_pos == 4 && mainGame->scrFilter->isVisible()) {
+				int dragpos = dragy - mouse_pos.Y;
 			    char log_dragpos[256];
 			    sprintf(log_dragpos, "dragpos=%d", dragpos);
 			    os::Printer::log(log_dragpos);
-			    if(dragpos > 0) {
-			        if(mainGame->scrFilter->getPos() < mainGame->scrFilter->getMax())
-			            mainGame->scrFilter->setPos((mainGame->scrFilter->getPos() + 1));
-			    } else if(dragpos < 0){
-			        if(mainGame->scrFilter->getPos() > 0)
-			            mainGame->scrFilter->setPos((mainGame->scrFilter->getPos() - 1));
-			    } else {
-
+			    if(dragpos > 0 && mainGame->scrFilter->getPos() < mainGame->scrFilter->getMax()) {
+			        mainGame->scrFilter->setPos(mainGame->scrFilter->getPos() + 1);
+			    } else if(dragpos < 0 && mainGame->scrFilter->getPos() > 0){
+			        mainGame->scrFilter->setPos(mainGame->scrFilter->getPos() - 1);
 			    }
             }
 			GetHoveredCard();
@@ -1318,14 +1317,14 @@ void DeckBuilder::GetHoveredCard() {
 			}
 		}
 	} else if(x >= 805 * mainGame->xScale && x <= 995 * mainGame->xScale && y >= 165 * mainGame->yScale && y <= 626 * mainGame->yScale) {
-        hovered_pos = 4;
+		hovered_pos = 4;
         hovered_seq = (y - 165 * mainGame->yScale) / (66 * mainGame->yScale);
 		int pos = mainGame->scrFilter->getPos() + hovered_seq;
 		if(pos >= (int)results.size()) {
-		    hovered_seq = -1;
-		    hovered_code = 0;
+			hovered_seq = -1;
+			hovered_code = 0;
 		} else if(x >= 805 * mainGame->xScale && x <= 850 * mainGame->xScale) {
-		    hovered_code = results[pos]->first;
+			hovered_code = results[pos]->first;
 		} else if(x > 850 * mainGame->xScale && x <= 995 * mainGame->xScale) {
 		    mainGame->ShowCardInfo(results[pos]->first);
 		}
@@ -1491,7 +1490,7 @@ void DeckBuilder::FilterCards() {
 		if(filter_marks && (data.link_marker & filter_marks)!= filter_marks)
 			continue;
 		if(filter_lm) {
-			if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList)[ptr->first] != filter_lm - 1))
+			if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList).at(ptr->first) != filter_lm - 1))
 				continue;
 			if(filter_lm == 4 && data.ot != 1)
 				continue;
@@ -1644,7 +1643,7 @@ bool DeckBuilder::CardNameContains(const wchar_t *haystack, const wchar_t *needl
 				return true;
 			}
 		} else {
-            i -= j;
+			i -= j;
 			j = 0;
 		}
 		i++;