changeset 1951:36e6563b8daa

Assorted minor changes (see verbose log) * Changed version to 3.0-pre * Made PgUp/PgDn Up/Dn keys shift focus from location to main area * Set http://dillo.org as the status bar first message (was "hola!). * Doubled the mousewheel scrollstep
author Jorge Arellano Cid <jcid@dillo.org>
date Thu, 17 Mar 2011 17:26:18 -0300
parents cd551611000a
children fb462b4abcfa
files configure.in src/ui.cc src/uicmd.cc
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Tue Mar 15 13:01:14 2011 -0300
+++ b/configure.in	Thu Mar 17 17:26:18 2011 -0300
@@ -1,6 +1,6 @@
 dnl Process this file with aclocal, autoconf and automake.
 
-AC_INIT([dillo], [2.2])
+AC_INIT([dillo], [3.0-pre])
 
 dnl Detect the canonical target build environment
 AC_CANONICAL_TARGET
--- a/src/ui.cc	Tue Mar 15 13:01:14 2011 -0300
+++ b/src/ui.cc	Thu Mar 17 17:26:18 2011 -0300
@@ -124,6 +124,13 @@
             // Let these keys get to the UI
             return 0;
          }
+      } else if (modifier == 0) {
+         if (k == FL_Down || k == FL_Up ||
+             k == FL_Page_Down || k == FL_Page_Up) {
+            // Give up focus and honor the key
+            a_UIcmd_focus_main_area(a_UIcmd_get_bw_by_widget(this));
+            return 0;
+         }
       }
    }
 
@@ -623,7 +630,7 @@
 
     // Status box
     StatusOutput = new Fl_Output(0, wh-sh, ww-bm_w, sh);
-    StatusOutput->value("hola!");
+    StatusOutput->value("http://dillo.org");
     StatusOutput->labelsize(8);
     StatusOutput->box(FL_THIN_DOWN_BOX);
     StatusOutput->clear_visible_focus();
@@ -1112,13 +1119,13 @@
       insert(*FindBar, StatusBar);
       FindBar->show();
       FindBarSpace = 1;
+      redraw();
    } else if (!add && FindBarSpace) {
       // hide
       Main->size(Main->w(), Main->h()+FindBar->h());
       remove(FindBar);
       FindBarSpace = 0;
+      redraw();  /* Main->redraw(); is not enough */
    }
 
-   // Main->redraw(); is not enough
-   redraw();
 }
--- a/src/uicmd.cc	Tue Mar 15 13:01:14 2011 -0300
+++ b/src/uicmd.cc	Thu Mar 17 17:26:18 2011 -0300
@@ -429,7 +429,7 @@
    viewport->setBufferedDrawing (prefs.buffered_drawing ? true : false);
    layout->attachView (viewport);
    new_ui->set_render_layout(viewport);
-   viewport->setScrollStep((int) rint(14.0 * prefs.font_factor));
+   viewport->setScrollStep((int) rint(28.0 * prefs.font_factor));
 
    // Now, create a new browser window structure
    BrowserWindow *new_bw = a_Bw_new();