Changeset 8140 in orxonox.OLD for branches/gui/src

Timestamp:

Jun 4, 2006, 12:36:45 AM (19 years ago)

Author:

bensch

Message:

gui: shorter paths for different guis

Location:

branches/gui/src

Files:

• defs/include_paths.am (modified) (1 diff)
• lib/BuildLibs.am (modified) (1 diff)
• lib/gui/Makefile.am (modified) (1 diff)
• lib/gui/gl (moved) (moved from branches/gui/src/lib/gui/gl_gui)
• lib/gui/gl/glgui_slider.cc (modified) (2 diffs)
• lib/gui/gl/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• lib/gui/gtk (moved) (moved from branches/gui/src/lib/gui/gtk_gui)
• lib/gui/qt (moved) (moved from branches/gui/src/lib/gui/qt_gui)
• lib/math/rect2D.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

branches/gui/src/defs/include_paths.am

@@ -12 +12 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gtk_gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui/glmenu
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl/glmenu
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/shell

branches/gui/src/lib/BuildLibs.am

@@ -3 +3 @@
                 $(LIB_PREFIX)/libORXlibs.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
-                $(LIB_PREFIX)/gui/qt_gui/libORXqtgui.a \
-                $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
+                $(LIB_PREFIX)/gui/qt/libORXqtgui.a \
+                $(LIB_PREFIX)/gui/gl/libORXglgui.a \
                 $(LIB_PREFIX)/gui/libORXbasegui.a \
                 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \

branches/gui/src/lib/gui/Makefile.am

@@ -23 +23 @@
 SUBDIRS = \
         . \
-        gl_gui \
-        qt_gui
+        gl \
+        qt
 
 #       gtk_gui

branches/gui/src/lib/gui/gl/glgui_slider.cc

@@ -161 +161 @@
   {
     GLGuiWidget::resize();
-    this->frontRect().setTopLeft(5, this->getSizeY2D()/2.0 - 2.0);
-    this->frontRect().setSize(this->getSizeX2D() - 10.0, 4.0);
+    this->frontRect().setTopLeft(this->borderLeft(), this->getSizeY2D()/2.0 - 2.0);
+    this->frontRect().setSize(this->getSizeX2D() - borderLeft() - borderRight(), 4.0);
   }
 
@@ -231 +231 @@
     this->drawRect(this->frontRect());
 
-    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom())));
+    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, 0*this->borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom()) +20));
 
     this->endDraw();

branches/gui/src/lib/gui/gl/glgui_widget.cc

@@ -71 +71 @@
     this->_borderLeft = 1.0;
     this->_borderRight = 1.0;
-    this->_borderTop = 1.0;
+    this->_borderTop = 20.0;
     this->_borderBottom = 1.0;
   }

branches/gui/src/lib/gui/gl/glgui_widget.h

@@ -160 +160 @@
     float                          _borderBottom;
 
+    Vector2D                       _minSize;
+
     /// EVENTS
     bool                           _focusable;        //!< If this widget can receive focus.

branches/gui/src/lib/math/rect2D.cc

@@ -36 +36 @@
 Rect2D::Rect2D(float x, float y, float width, float height)
 {
-  this->setLeft(x), this->setTop(y);
+  this->setLeft(x),
+  this->setTop(y);
   this->setSize(width, height);
 }

branches/gui/src/orxonox.cc

@@ -30 +30 @@
 #include "globals.h"
 
-#include "gui/qt_gui/qt_gui.h"
+#include "gui/qt/qt_gui.h"
 
 #include "file.h"