Skip to content

Commit

Permalink
Android: finally taught AndroidStudio where the SVN root directory is
Browse files Browse the repository at this point in the history
located. No more SVN from the command line.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12732 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Matthias Melcher committed Mar 10, 2018
1 parent 329f43e commit 70e629b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.Android.txt
Expand Up @@ -23,8 +23,8 @@ AndroidStudio for the first time, use the IDE to download and build the
FLTK will be installed. Once Native Plasm runs on your emulator or physical
device, you are ready to install FLTK.

- if your host machine runs MSWindows, unzip the file
"ide/AndroidStudio3/gradlew.zip" first
- if your host machine runs MSWindows, rename the file
"ide/AndroidStudio3/gradlew.rename_to_bat" to "gradlew.bat" first

- open the "ide/AndroidStudio3/" directory as a project in AndroidStudio

Expand Down
3 changes: 3 additions & 0 deletions ide/AndroidStudio3/settings.gradle
@@ -1 +1,4 @@
include ':app'

include ':FLTK'
project(':FLTK').projectDir = new File('../../')
1 change: 0 additions & 1 deletion src/drivers/Android/Fl_Android_Graphics_Driver.cxx
Expand Up @@ -55,7 +55,6 @@ static uint16_t make565(Fl_Color crgba)

void Fl_Android_Graphics_Driver::rectf_unscaled(float x, float y, float w, float h) {
if (pWindowRegion) {
Fl_Android_Application::log_w("rectf %g %g %g %g", x, y, w, h);
Fl_Rect_Region r(x, y, w, h);
if (r.intersect_with(pWindowRegion)) {
rectf_unclipped(r.x(), r.y(), r.w(), r.h());
Expand Down

0 comments on commit 70e629b

Please sign in to comment.