Some tweaks on the touch controls
This commit is contained in:
parent
c4abfc0737
commit
b3847817f4
2
Makefile
2
Makefile
|
@ -45,7 +45,7 @@ INCLUDES := include include/menus/book include/menus/book-chooser include/he
|
|||
ROMFS := romfs
|
||||
|
||||
VERSION_MAJOR := 0
|
||||
VERSION_MINOR := 3
|
||||
VERSION_MINOR := 4
|
||||
VERSION_MICRO := 0
|
||||
|
||||
APP_TITLE := eBookReader
|
||||
|
|
|
@ -46,7 +46,7 @@ Light Mode Landscape Reading:
|
|||
* NX-Shell Team - A good amount of the code is from an old version of their application.
|
||||
|
||||
### Building
|
||||
* Release built with [libnx release v2.4.0](https://github.com/switchbrew/libnx).
|
||||
* Release built with [libnx release v4.1.3](https://github.com/switchbrew/libnx).
|
||||
* Uses `freetype` and other libs which comes with `switch-portlibs` via `devkitPro pacman`:
|
||||
```
|
||||
pacman -S libnx switch-portlibs
|
||||
|
|
|
@ -51,25 +51,25 @@ void Menu_OpenBook(char *path) {
|
|||
}
|
||||
|
||||
for(s32 i=0; i<state.count; i++) {
|
||||
if (state.touches[i].x > 1000)
|
||||
if (state.touches[i].x > 1000 && (state.touches[i].y > 200 && state.touches[i].y < 500))
|
||||
if (reader->currentPageLayout() == BookPageLayoutPortrait)
|
||||
reader->next_page(1);
|
||||
else if (reader->currentPageLayout() == BookPageLayoutLandscape)
|
||||
reader->zoom_in();
|
||||
|
||||
if (state.touches[i].x < 280)
|
||||
if (state.touches[i].x < 280 && (state.touches[i].y > 200 && state.touches[i].y < 500))
|
||||
if (reader->currentPageLayout() == BookPageLayoutPortrait)
|
||||
reader->previous_page(1);
|
||||
else if (reader->currentPageLayout() == BookPageLayoutLandscape)
|
||||
reader->zoom_out();
|
||||
|
||||
if (state.touches[i].y < 200 && (state.touches[i].x > 280 || state.touches[i].x < 1000))
|
||||
if (state.touches[i].y < 200)
|
||||
if (reader->currentPageLayout() == BookPageLayoutPortrait)
|
||||
reader->zoom_in();
|
||||
else if (reader->currentPageLayout() == BookPageLayoutLandscape)
|
||||
reader->previous_page(1);
|
||||
|
||||
if (state.touches[i].y > 500 && (state.touches[i].x > 280 || state.touches[i].x < 1000))
|
||||
if (state.touches[i].y > 500)
|
||||
if (reader->currentPageLayout() == BookPageLayoutPortrait)
|
||||
reader->zoom_out();
|
||||
else if (reader->currentPageLayout() == BookPageLayoutLandscape)
|
||||
|
@ -137,7 +137,7 @@ void Menu_OpenBook(char *path) {
|
|||
else if (!helpMenu && kDown & HidNpadButton_LeftSL)
|
||||
reader->previous_page(10);
|
||||
|
||||
if (kDown & HidNpadButton_B) {
|
||||
if (kUp & HidNpadButton_B) {
|
||||
if (helpMenu) {
|
||||
helpMenu = !helpMenu;
|
||||
} else {
|
||||
|
@ -191,4 +191,5 @@ void Menu_OpenBook(char *path) {
|
|||
std::cout << "Opening chooser" << std::endl;
|
||||
Menu_StartChoosing();
|
||||
delete reader;
|
||||
// consoleExit(NULL);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue