Brand spankin new widgets for otk (Label and Button).

Add a new Size class.
Rect, Point, and Size are immutable classes.
Size uses *UNSIGNED* ints. This is causing me headaches * a bajillion right now, so we'll see about that.

1 files changed, 16 insertions, 61 deletions

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index fb4db835..c36abfd1 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -5,75 +5,30 @@
 #endif
 
 #include "application.hh"
-#include "focuswidget.hh"
 #include "appwidget.hh"
+#include "label.hh"
 #include "button.hh"
 
 int main(int argc, char **argv) {
   otk::Application app(argc, argv);
 
-  otk::AppWidget foo(&app);
-
-  foo.resize(600, 500);
-  foo.setTexture(app.getStyle()->titlebarFocusBackground());
-//  foo.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
-
-  foo.setBevelWidth(2);
-  foo.setDirection(otk::Widget::Horizontal);
-
-  otk::FocusWidget left(&foo);
-  otk::FocusWidget right(&foo);
-
-  left.setDirection(otk::Widget::Horizontal);
-  left.setStretchableVert(true);
-  left.setStretchableHorz(true);
-  left.setTexture(app.getStyle()->titlebarFocusBackground());
-  left.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
- 
-  right.setDirection(otk::Widget::Vertical);
-  right.setBevelWidth(10);
-  right.setStretchableVert(true);
-  right.setWidth(300);
-  right.setTexture(app.getStyle()->titlebarFocusBackground());
-  right.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
-  otk::Button iconb(&left);
-  iconb.resize(40,20);
-
-/*  otk::FocusWidget label(&left);
-  otk::Button maxb(&left);
-  otk::Button closeb(&left);
+  otk::AppWidget foo(&app, otk::Widget::Vertical, 3);
+  otk::Label lab(&foo);
+  otk::Label lab2(&foo);
+  otk::Button but(&foo);
+  otk::Button but2(&foo);
   
-  // fixed size
-  iconb.setText("foo");
-  iconb.press(Button1);
-
-  // fix width to 60 and let the height be calculated by its parent
-  //label.setHeight(20);
-  label.setStretchableVert(true);
-  label.setStretchableHorz(true);
-  label.setTexture(app.getStyle()->labelFocusBackground());
-  label.setUnfocusTexture(app.getStyle()->labelUnfocusBackground());
-
-  // fixed size
-  maxb.setText("bar");
-
-  // fixed size
-  closeb.setText("fuubar");
-*/
-  otk::FocusWidget rblef(&right);
-  otk::Button rbutt1(&right);
-  otk::Button rbutt2(&right);
-
-  rblef.setStretchableHorz(true);
-  rblef.setHeight(50);
-  rblef.setTexture(app.getStyle()->handleFocusBackground());
-  rblef.setUnfocusTexture(app.getStyle()->handleUnfocusBackground());
+  foo.resize(otk::Size(100, 150));
+
+  lab.setText("Hi, I'm a sexy\nlabel!!!");
+  lab.setMaxSize(otk::Size(0,0));
+  lab2.setText("Me too!!");
+  lab2.setBorderWidth(10);
+  lab2.setBorderColor(otk::RenderStyle::style(app.screen())->buttonFocusColor());
+  but.setText("Im not the default button...");
+  but2.setText("But I AM!!");
+  but2.setDefault(true);
   
-  rbutt1.setText("this is fucking tight");
-  rbutt2.setText("heh, WOOP");
-
-  // will recursively unfocus its children
-  //foo.unfocus();
 
   foo.show();