kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename to window.focus ()

Browse Source
This commit is contained in:
Joshua Granick
2015-08-25 16:26:09 -07:00
parent 92791433ba
commit b10a876307
8 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project/src/ExternalInterface.cpp
View File

@@ -1163,6 +1163,15 @@ namespace lime {
}
value lime_window_focus (value window) {
Window* targetWindow = (Window*)(intptr_t)val_float (window);
targetWindow->Focus ();
return alloc_null ();
}
value lime_window_get_enable_text_events (value window) {
Window* targetWindow = (Window*)(intptr_t)val_float (window);
@@ -1219,13 +1228,6 @@ namespace lime {
}
value lime_window_raise (value window) {
Window* targetWindow = (Window*)(intptr_t)val_float (window);
targetWindow->Raise ();
return alloc_null ();
}
value lime_window_resize (value window, value width, value height) {
@@ -1366,6 +1368,7 @@ namespace lime {
DEFINE_PRIM (lime_window_close, 1);
DEFINE_PRIM (lime_window_create, 5);
DEFINE_PRIM (lime_window_event_manager_register, 2);
DEFINE_PRIM (lime_window_focus, 1);
DEFINE_PRIM (lime_window_get_enable_text_events, 1);
DEFINE_PRIM (lime_window_get_height, 1);
DEFINE_PRIM (lime_window_get_id, 1);
@@ -1373,7 +1376,6 @@ namespace lime {
DEFINE_PRIM (lime_window_get_x, 1);
DEFINE_PRIM (lime_window_get_y, 1);
DEFINE_PRIM (lime_window_move, 3);
DEFINE_PRIM (lime_window_raise, 1);
DEFINE_PRIM (lime_window_resize, 3);
DEFINE_PRIM (lime_window_set_enable_text_events, 2);
DEFINE_PRIM (lime_window_set_fullscreen, 2);

13
project/src/backend/sdl/SDLWindow.cpp
View File

@@ -116,6 +116,13 @@ namespace lime {
}
void SDLWindow::Focus () {
SDL_RaiseWindow (sdlWindow);
}
bool SDLWindow::GetEnableTextEvents () {
return SDL_IsTextInputActive ();
@@ -184,12 +191,6 @@ namespace lime {
}
void SDLWindow::Raise () {
SDL_RaiseWindow (sdlWindow);
}
void SDLWindow::Resize (int width, int height) {

2
project/src/backend/sdl/SDLWindow.h
View File

@@ -18,6 +18,7 @@ namespace lime {
~SDLWindow ();
virtual void Close ();
virtual void Focus ();
virtual bool GetEnableTextEvents ();
virtual int GetHeight ();
virtual uint32_t GetID ();
@@ -25,7 +26,6 @@ namespace lime {
virtual int GetX ();
virtual int GetY ();
virtual void Move (int x, int y);
virtual void Raise ();
virtual void Resize (int width, int height);
virtual void SetEnableTextEvents (bool enabled);
virtual bool SetFullscreen (bool fullscreen);