Renamed UpdateScreen() to UpdateGuiScreen()
To avoid confusion with the emulation screen
This commit is contained in:
parent
8c1c8110c5
commit
0ab994809d
8 changed files with 60 additions and 60 deletions
|
@ -251,7 +251,7 @@ static void CreateFilesysHardfileLoop()
|
|||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
|
||||
UpdateScreen();
|
||||
UpdateGuiScreen();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -316,7 +316,7 @@ static void EditFilesysHardfileLoop()
|
|||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
|
||||
UpdateScreen();
|
||||
UpdateGuiScreen();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -201,62 +201,62 @@ static void ExitEditFilesysVirtual(void)
|
|||
|
||||
static void EditFilesysVirtualLoop(void)
|
||||
{
|
||||
while(!dialogFinished)
|
||||
{
|
||||
SDL_Event event;
|
||||
while(SDL_PollEvent(&event))
|
||||
{
|
||||
if (event.type == SDL_KEYDOWN)
|
||||
{
|
||||
switch(event.key.keysym.sym)
|
||||
{
|
||||
case VK_ESCAPE:
|
||||
dialogFinished = true;
|
||||
break;
|
||||
while (!dialogFinished)
|
||||
{
|
||||
SDL_Event event;
|
||||
while (SDL_PollEvent(&event))
|
||||
{
|
||||
if (event.type == SDL_KEYDOWN)
|
||||
{
|
||||
switch (event.key.keysym.sym)
|
||||
{
|
||||
case VK_ESCAPE:
|
||||
dialogFinished = true;
|
||||
break;
|
||||
|
||||
case VK_UP:
|
||||
if(HandleNavigation(DIRECTION_UP))
|
||||
continue; // Don't change value when enter ComboBox -> don't send event to control
|
||||
break;
|
||||
case VK_UP:
|
||||
if (HandleNavigation(DIRECTION_UP))
|
||||
continue; // Don't change value when enter ComboBox -> don't send event to control
|
||||
break;
|
||||
|
||||
case VK_DOWN:
|
||||
if(HandleNavigation(DIRECTION_DOWN))
|
||||
continue; // Don't change value when enter ComboBox -> don't send event to control
|
||||
break;
|
||||
case VK_DOWN:
|
||||
if (HandleNavigation(DIRECTION_DOWN))
|
||||
continue; // Don't change value when enter ComboBox -> don't send event to control
|
||||
break;
|
||||
|
||||
case VK_LEFT:
|
||||
if(HandleNavigation(DIRECTION_LEFT))
|
||||
continue; // Don't change value when enter Slider -> don't send event to control
|
||||
break;
|
||||
case VK_LEFT:
|
||||
if (HandleNavigation(DIRECTION_LEFT))
|
||||
continue; // Don't change value when enter Slider -> don't send event to control
|
||||
break;
|
||||
|
||||
case VK_RIGHT:
|
||||
if(HandleNavigation(DIRECTION_RIGHT))
|
||||
continue; // Don't change value when enter Slider -> don't send event to control
|
||||
break;
|
||||
case VK_RIGHT:
|
||||
if (HandleNavigation(DIRECTION_RIGHT))
|
||||
continue; // Don't change value when enter Slider -> don't send event to control
|
||||
break;
|
||||
|
||||
case VK_X:
|
||||
case VK_A:
|
||||
event.key.keysym.sym = SDLK_RETURN;
|
||||
gui_input->pushInput(event); // Fire key down
|
||||
event.type = SDL_KEYUP; // and the key up
|
||||
break;
|
||||
}
|
||||
}
|
||||
case VK_X:
|
||||
case VK_A:
|
||||
event.key.keysym.sym = SDLK_RETURN;
|
||||
gui_input->pushInput(event); // Fire key down
|
||||
event.type = SDL_KEYUP; // and the key up
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//-------------------------------------------------
|
||||
// Send event to guisan-controls
|
||||
//-------------------------------------------------
|
||||
gui_input->pushInput(event);
|
||||
}
|
||||
//-------------------------------------------------
|
||||
// Send event to guisan-controls
|
||||
//-------------------------------------------------
|
||||
gui_input->pushInput(event);
|
||||
}
|
||||
|
||||
// Now we let the Gui object perform its logic.
|
||||
uae_gui->logic();
|
||||
// Now we let the Gui object draw itself.
|
||||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
// Now we let the Gui object perform its logic.
|
||||
uae_gui->logic();
|
||||
// Now we let the Gui object draw itself.
|
||||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
|
||||
UpdateScreen();
|
||||
}
|
||||
UpdateGuiScreen();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ void InGameMessage(const char *msg)
|
|||
// Finally we update the screen.
|
||||
if (!drawn)
|
||||
{
|
||||
UpdateScreen();
|
||||
UpdateGuiScreen();
|
||||
}
|
||||
drawn = true;
|
||||
}
|
||||
|
|
|
@ -352,7 +352,7 @@ static void SelectFileLoop()
|
|||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
|
||||
UpdateScreen();
|
||||
UpdateGuiScreen();
|
||||
|
||||
if (!dialogCreated)
|
||||
{
|
||||
|
|
|
@ -144,7 +144,7 @@ static void ShowMessageLoop()
|
|||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
|
||||
UpdateScreen();
|
||||
UpdateGuiScreen();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -124,6 +124,6 @@ extern char *screenshot_filename;
|
|||
extern int currentStateNum;
|
||||
extern int delay_savestate_frame;
|
||||
|
||||
extern void UpdateScreen();
|
||||
extern void UpdateGuiScreen();
|
||||
|
||||
#endif // _GUI_HANDLING_H
|
||||
|
|
|
@ -139,7 +139,7 @@ void RegisterRefreshFunc(void (*func)())
|
|||
refreshFuncAfterDraw = func;
|
||||
}
|
||||
|
||||
void UpdateScreen()
|
||||
void UpdateGuiScreen()
|
||||
{
|
||||
// Update the texture from the surface
|
||||
SDL_UpdateTexture(gui_texture, nullptr, gui_screen->pixels, gui_screen->pitch);
|
||||
|
@ -319,7 +319,7 @@ namespace sdl
|
|||
uae_gui->draw();
|
||||
// Finally we update the screen.
|
||||
|
||||
UpdateScreen();
|
||||
UpdateGuiScreen();
|
||||
|
||||
if (refreshFuncAfterDraw != nullptr)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue