From: terencehill Date: Sat, 28 Feb 2015 17:15:46 +0000 (+0100) Subject: Properly set/reset highlightedAction X-Git-Tag: xonotic-v0.8.1~58^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21e235cd4fd962e915df0444137f2899e6b2879e;p=xonotic%2Fxonotic-data.pk3dir.git Properly set/reset highlightedAction --- diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc index 898f3eb56..764b42a9a 100644 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@ -433,8 +433,7 @@ void HUD_Panel_SetPosSize(vector mySize) { panel = highlightedPanel; HUD_Panel_UpdatePosSize(); - vector resizeorigin; - resizeorigin = panel_click_resizeorigin; + vector resizeorigin = panel_click_resizeorigin; vector myPos; // minimum panel size cap @@ -567,7 +566,6 @@ void HUD_Panel_Arrow_Action(float nPrimary) if (hudShiftState & S_ALT) // resize { - highlightedAction = 1; if(nPrimary == K_UPARROW) resizeCorner = 1; else if(nPrimary == K_RIGHTARROW) @@ -604,7 +602,6 @@ void HUD_Panel_Arrow_Action(float nPrimary) } else // move { - highlightedAction = 2; vector pos; pos = panel_pos; if(nPrimary == K_UPARROW) @@ -1178,6 +1175,8 @@ void HUD_Panel_Mouse() } else { + if(prevMouseClicked) + highlightedAction = 0; if(menu_enabled == 2) mouse_over_panel = 0; else