X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_test.cc;h=ec352f9f13ebf58d8e4b44cafc325474a1893a65;hb=6f5e60f0337e60d904a8f549aeaa631afefc8033;hp=6b4d02505d55304db41b309867a25025f2400535;hpb=9e1b25490507071087d768a8873078a1ba2a8e04;p=chaz%2Fopenbox

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index 6b4d0250..ec352f9f 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,78 +1,75 @@
+#include "application.hh"
 #include "focuswidget.hh"
-#include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
-
-int main(void) {
-  otk::OBDisplay::initialize(NULL);
-  otk::Configuration style_conf(False);
-  otk::OBTimerQueueManager *tm = new otk::OBTimerQueueManager();
-  const otk::ScreenInfo *s_info =
-    otk::OBDisplay::screenInfo(DefaultScreen(otk::OBDisplay::display));
-  otk::BImageControl *ctrl = new otk::BImageControl(tm, s_info, True, 4, 5, 200);
-
-  otk::Style *my_style = new otk::Style(ctrl);
-
-  const char *sfile = "/usr/local/share/openbox/styles/artwiz";
-  
-  style_conf.setFile(sfile);
-  style_conf.load();
-
-  my_style->load(style_conf);
+#include "button.hh"
 
-  otk::OtkFocusWidget foo(my_style);
-  otk::OtkFocusWidget iconb(&foo);
-  otk::OtkFocusWidget label(&foo);
-  otk::OtkFocusWidget maxb(&foo);
-  otk::OtkFocusWidget closeb(&foo);
+int main(int argc, char **argv) {
+  otk::OtkApplication app(argc, argv);
 
-  foo.setBevelWidth(2);
+  otk::OtkFocusWidget foo(&app);
 
-  // fix the width to 400. the height will be determined by the height of
-  // its children
-  foo.setWidth(400);
-  foo.setTexture(my_style->getTitleFocus());
-  foo.setUnfocusTexture(my_style->getTitleUnfocus());
+  foo.resize(600, 500);
+  foo.setTexture(app.getStyle()->getTitleFocus());
+  foo.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
 
+  foo.setBevelWidth(2);
+  foo.setDirection(otk::OtkWidget::Horizontal);
+
+  otk::OtkFocusWidget left(&foo);
+  otk::OtkFocusWidget right(&foo);
+
+  left.setDirection(otk::OtkWidget::Horizontal);
+  left.setStretchableVert(true);
+  left.setStretchableHorz(true);
+  left.setTexture(app.getStyle()->getTitleFocus());
+  left.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
+ 
+  right.setDirection(otk::OtkWidget::Vertical);
+  right.setBevelWidth(10);
+  right.setStretchableVert(true);
+  right.setWidth(300);
+  right.setTexture(app.getStyle()->getTitleFocus());
+  right.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
+
+  otk::OtkButton iconb(&left);
+  otk::OtkFocusWidget label(&left);
+  otk::OtkButton maxb(&left);
+  otk::OtkButton closeb(&left);
+  
   // fixed size
-  iconb.resize(15, 15);
-  iconb.setTexture(my_style->getButtonFocus());
-  iconb.setUnfocusTexture(my_style->getButtonUnfocus());
+  iconb.setText("foo");
+  iconb.press();
 
-  // fix height to 15 and let the width be calculated by its parent
-  label.setHeight(15);
+  // fix width to 60 and let the height be calculated by its parent
+  //label.setHeight(20);
+  label.setStretchableVert(true);
   label.setStretchableHorz(true);
-  label.setTexture(my_style->getLabelFocus());
-  label.setUnfocusTexture(my_style->getLabelUnfocus());
+  label.setTexture(app.getStyle()->getLabelFocus());
+  label.setUnfocusTexture(app.getStyle()->getLabelUnfocus());
 
   // fixed size
-  maxb.resize(15, 15);
-  maxb.setTexture(my_style->getButtonFocus());
-  maxb.setUnfocusTexture(my_style->getButtonUnfocus());
+  maxb.setText("bar");
 
   // fixed size
-  closeb.resize(15, 15);
-  closeb.setTexture(my_style->getButtonFocus());
-  closeb.setUnfocusTexture(my_style->getButtonUnfocus());
+  closeb.setText("fuubar");
 
-  // will recursively unfocus its children
-  foo.unfocus();
-  foo.show();
+  otk::OtkFocusWidget rblef(&right);
+  otk::OtkButton rbutt1(&right);
+  otk::OtkButton rbutt2(&right);
 
-  while (1) {
-    if (XPending(otk::OBDisplay::display)) {
-      XEvent e;
-      XNextEvent(otk::OBDisplay::display, &e);
-    } 
-  }
+  rblef.setStretchableHorz(true);
+  rblef.setHeight(50);
+  rblef.setTexture(app.getStyle()->getHandleFocus());
+  rblef.setUnfocusTexture(app.getStyle()->getHandleUnfocus());
+  
+  rbutt1.setText("this is fucking tight");
+  rbutt2.setText("heh, WOOP");
 
-  delete my_style;
-  delete tm;
-  delete ctrl;
+  // will recursively unfocus its children
+  //foo.unfocus();
+
+  foo.show();
 
-  otk::OBDisplay::destroy();
+  app.exec();
 
   return 0;
 }