From 88ce4aec17dbf37de19060f03e543e7bf26fc1af Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 11 Mar 2018 22:00:59 +0000 Subject: Android: Made Fl_Rect virtual. Maybe a bad idea? Also, added rectangular clipping which works. Expanding now to a more complex clipping scheme to make multiple windows work. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12739 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- .../app/src/main/cpp/HelloAndroid.cxx | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'ide/AndroidStudio3/app/src/main/cpp') diff --git a/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx b/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx index 582319020..207a78817 100644 --- a/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx +++ b/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx @@ -21,35 +21,42 @@ #include #include -Fl_Window *win; + +Fl_Window *win, *win2, *win3; Fl_Button *btn; + class MyButton : public Fl_Button { public: MyButton(int x, int y, int w, int h, const char *l) : Fl_Button(x, y, w, h, l) { } void draw() { - fl_push_clip(x(), y(), w()/2, h()/2); + fl_push_clip(x(), y(), w()*2/3, h()*2/3); Fl_Button::draw(); fl_pop_clip(); } }; -int h(void*, void*) -{ - Fl_Android_Application::log_w("App global event %p", Fl::event()); - return 0; -} int main(int argc, char **argv) { - Fl::add_system_handler(h, 0); - win = new Fl_Window(10, 10, 600, 400, "Hallo"); - btn = new MyButton(190, 200, 280, 35, "Hello, Android!"); + win2 = new Fl_Window(100, 50, 150, 200, "on bottom"); + win2->color(FL_BLUE); + win2->end(); + win2->show(); + + win = new Fl_Window(50, 150, 500, 400, "Hallo"); + btn = new MyButton((win->w()-280)/2, 200, 280, 35, "Hello, Android!"); btn->color(FL_LIGHT2); win->show(argc, argv); - +/* + win3 = new Fl_Window(300, 50, 150, 200, "on top"); + win3->color(FL_RED); + win3->end(); + win3->show(); +*/ Fl::run(); return 0; } + -- cgit v1.2.3