Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wait 300ms before displaying map preview, for less flashiness.

master
Cyp 2011-12-12 01:39:30 +01:00
parent 53beded902
commit 85974cab80
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/multimenu.cpp
View File

@ -23,6 +23,7 @@
* Also the selection of disk files.. * Also the selection of disk files..
*/ */
#include "lib/framework/frame.h" #include "lib/framework/frame.h"
#include "lib/framework/wzapp_c.h"
#include "lib/framework/strres.h" #include "lib/framework/strres.h"
#include "lib/widget/button.h" #include "lib/widget/button.h"
#include "lib/widget/widget.h" #include "lib/widget/widget.h"
@ -157,6 +158,8 @@ static char const * M_REQUEST_NP_TIPS[] = { N_("2 players"), N_("3 players"),
#define R_BUT_W 105//112 #define R_BUT_W 105//112
#define R_BUT_H 30 #define R_BUT_H 30
#define HOVER_PREVIEW_TIME 300
bool multiRequestUp = false; //multimenu is up. bool multiRequestUp = false; //multimenu is up.
static unsigned hoverPreviewId; static unsigned hoverPreviewId;
static bool giftsUp[MAX_PLAYERS] = {true}; //gift buttons for player are up. static bool giftsUp[MAX_PLAYERS] = {true}; //gift buttons for player are up.
@ -667,6 +670,9 @@ static void closeMultiRequester(void)
bool runMultiRequester(UDWORD id, UDWORD *mode, char *chosen, UDWORD *chosenValue, bool *isHoverPreview) bool runMultiRequester(UDWORD id, UDWORD *mode, char *chosen, UDWORD *chosenValue, bool *isHoverPreview)
{ {
static unsigned hoverId = 0;
static unsigned hoverStartTime = 0;
if( (id == M_REQUEST_CLOSE) || CancelPressed() ) // user hit close box || hit the cancel key if( (id == M_REQUEST_CLOSE) || CancelPressed() ) // user hit close box || hit the cancel key
{ {
closeMultiRequester(); closeMultiRequester();
@ -678,9 +684,14 @@ bool runMultiRequester(UDWORD id, UDWORD *mode, char *chosen, UDWORD *chosenValu
if (id == 0 && context == MULTIOP_MAP) if (id == 0 && context == MULTIOP_MAP)
{ {
id = widgGetMouseOver(psRScreen); id = widgGetMouseOver(psRScreen);
if (id == hoverPreviewId) if (id != hoverId)
{ {
id = 0; // Don't re-render preview. hoverId = id;
hoverStartTime = wzGetTicks() + HOVER_PREVIEW_TIME;
}
if (id == hoverPreviewId || hoverStartTime > wzGetTicks())
{
id = 0; // Don't re-render preview nor render preview before HOVER_PREVIEW_TIME.
} }
hoverPreview = true; hoverPreview = true;
} }