-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
20 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
|
||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |
|
||
#include <memory> | ||
|
||
#include <ruis/gui.hpp> | ||
#include <ruis/util/key.hpp> | ||
#include <papki/file.hpp> | ||
#include <r4/vector.hpp> | ||
#include <ruis/gui.hpp> | ||
#include <ruis/util/key.hpp> | ||
#include <utki/config.hpp> | ||
#include <utki/destructable.hpp> | ||
#include <utki/flags.hpp> | ||
|
@@ -287,10 +287,7 @@ class application : public utki::intrusive_singleton<application> | |
* @param screen_size_mm - size of the display in millimeters. | ||
* @return Size of one display density pixel in pixels. | ||
*/ | ||
static ruis::real get_pixels_per_pp( | ||
r4::vector2<unsigned> screen_size_pixels, | ||
r4::vector2<unsigned> screen_size_mm | ||
); | ||
static ruis::real get_pixels_per_pp(r4::vector2<unsigned> screen_size_pixels, r4::vector2<unsigned> screen_size_mm); | ||
}; | ||
|
||
inline application& inst() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
@@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |
#include <android/configuration.h> | ||
#include <android/native_activity.h> | ||
#include <android/window.h> | ||
#include <ruis/render/opengles/renderer.hpp> | ||
#include <nitki/queue.hpp> | ||
#include <ruis/render/opengles/renderer.hpp> | ||
#include <sys/eventfd.h> | ||
#include <utki/destructable.hpp> | ||
#include <utki/unicode.hpp> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
mordavokne - morda GUI adaptation layer | ||
ruisapp - morda GUI adaptation layer | ||
Copyright (C) 2016-2021 Ivan Gagis <[email protected]> | ||
|
@@ -22,10 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |
#include <ratio> | ||
|
||
#include <Shlobj.h> // needed for SHGetFolderPathA() | ||
#include <papki/fs_file.hpp> | ||
#include <ruis/context.hpp> | ||
#include <ruis/render/opengl/renderer.hpp> | ||
#include <ruis/util/util.hpp> | ||
#include <papki/fs_file.hpp> | ||
#include <utki/destructable.hpp> | ||
#include <utki/windows.hpp> | ||
#include <windowsx.h> // needed for GET_X_LPARAM macro and other similar macros | ||
|
@@ -550,20 +550,8 @@ LRESULT CALLBACK window_procedure(HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_ | |
} | ||
|
||
for (unsigned i = 0; i != times; ++i) { | ||
handle_mouse_button( | ||
ruisapp::inst(), | ||
true, | ||
ruis::vector2(float(pos.x), float(pos.y)), | ||
button, | ||
0 | ||
); | ||
handle_mouse_button( | ||
ruisapp::inst(), | ||
false, | ||
ruis::vector2(float(pos.x), float(pos.y)), | ||
button, | ||
0 | ||
); | ||
handle_mouse_button(ruisapp::inst(), true, ruis::vector2(float(pos.x), float(pos.y)), button, 0); | ||
handle_mouse_button(ruisapp::inst(), false, ruis::vector2(float(pos.x), float(pos.y)), button, 0); | ||
} | ||
} | ||
return 0; | ||
|
@@ -617,10 +605,7 @@ LRESULT CALLBACK window_procedure(HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_ | |
|
||
case WM_SIZE: | ||
// resize GL, LoWord=Width, HiWord=Height | ||
update_window_rect( | ||
ruisapp::inst(), | ||
ruis::rectangle(0, 0, float(LOWORD(l_param)), float(HIWORD(l_param))) | ||
); | ||
update_window_rect(ruisapp::inst(), ruis::rectangle(0, 0, float(LOWORD(l_param)), float(HIWORD(l_param)))); | ||
return 0; | ||
|
||
case WM_USER: | ||
|