From d2a7cbd2527455ccf070d748d72c69a43330b6a1 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <johannes.hofmann@gmx.de>
Date: Thu, 14 Apr 2005 19:48:26 +0000
Subject: UI changes
UI changes
---
src/GipfelWidget.cxx | 4 ++--
src/gipfel.cxx | 29 ++++++++++++++++-------------
2 files changed, 18 insertions(+), 15 deletions(-)
(limited to 'src')
diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx
index f4ad159..173f889 100644
--- a/src/GipfelWidget.cxx
+++ b/src/GipfelWidget.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: GipfelWidget.cxx,v 1.7 2005/04/14 21:15:45 hofmann Exp $"
+// "$Id: GipfelWidget.cxx,v 1.8 2005/04/14 21:48:28 hofmann Exp $"
//
// PSEditWidget routines.
//
@@ -83,7 +83,7 @@ GipfelWidget::draw() {
fl_push_clip(x(), y(), w(), h());
img->draw(x(),y(),w(),h(),0,0);
- fl_font(FL_COURIER, 10);
+ fl_font(FL_HELVETICA, 8);
m = pan->get_visible_mountains();
while (m) {
if (m == cur_mountain) {
diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index 471bb3e..3305312 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: gipfel.cxx,v 1.8 2005/04/14 21:15:45 hofmann Exp $"
+// "$Id: gipfel.cxx,v 1.9 2005/04/14 21:48:28 hofmann Exp $"
//
// flpsed program.
//
@@ -148,7 +148,16 @@ int main(int argc, char** argv) {
win = new Fl_Window(800,700);
m = new Fl_Menu_Bar(0, 0, 800, 30);
m->menu(menuitems);
- Fl_Slider* s = new Fl_Slider(0, 30, 160, 15, "scale");
+ Fl_Slider* a = new Fl_Slider(50, 30, 750, 15, "angle");
+ a->type(1);
+ a->box(FL_THIN_DOWN_BOX);
+ a->labelsize(10);
+ a->step(0.00001);
+ a->bounds(-3.14, 3.14);
+ a->slider(FL_UP_BOX);
+ a->callback((Fl_Callback*)angle_cb);
+ a->align(FL_ALIGN_LEFT);
+ Fl_Slider* s = new Fl_Slider(100, 45, 160, 15, "scale");
s->type(1);
s->box(FL_THIN_DOWN_BOX);
s->labelsize(10);
@@ -156,15 +165,8 @@ int main(int argc, char** argv) {
s->bounds(0.0, 2000.0);
s->slider(FL_UP_BOX);
s->callback((Fl_Callback*)scale_cb);
- Fl_Slider* a = new Fl_Slider(160, 30, 160, 15, "angle");
- a->type(1);
- a->box(FL_THIN_DOWN_BOX);
- a->labelsize(10);
- a->step(0.0001);
- a->bounds(-3.14, 3.14);
- a->slider(FL_UP_BOX);
- a->callback((Fl_Callback*)angle_cb);
- Fl_Slider* n = new Fl_Slider(320, 30, 160, 15, "nick");
+ s->align(FL_ALIGN_LEFT);
+ Fl_Slider* n = new Fl_Slider(360, 45, 160, 15, "nick");
n->type(1);
n->box(FL_THIN_DOWN_BOX);
n->labelsize(10);
@@ -172,7 +174,8 @@ int main(int argc, char** argv) {
n->bounds(-0.5, 0.5);
n->slider(FL_UP_BOX);
n->callback((Fl_Callback*)nick_cb);
- Fl_Slider* r = new Fl_Slider(480, 30, 160, 15, "height-dist");
+ n->align(FL_ALIGN_LEFT);
+ Fl_Slider* r = new Fl_Slider(620, 45, 160, 15, "height-dist");
r->type(1);
r->box(FL_THIN_DOWN_BOX);
r->labelsize(10);
@@ -180,7 +183,7 @@ int main(int argc, char** argv) {
r->bounds(0.2, 0.02);
r->slider(FL_UP_BOX);
r->callback((Fl_Callback*)h_d_cb);
-
+ r->align(FL_ALIGN_LEFT);
scroll = new Fl_Scroll(0, 60, win->w(), win->h()-60);
--
cgit v1.2.3