aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Arellano Cid <jcid@dillo.org>2011-03-17 17:26:18 -0300
committerJorge Arellano Cid <jcid@dillo.org>2011-03-17 17:26:18 -0300
commit9f7e29fb7765c0d3ae9b375e95585f047acc6140 (patch)
treeaed0a4ea100cf985bb5244f161bda7e7fe323e4b
parentdfce5ad6bc52369ebabcb508305dbffdaefd4553 (diff)
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
-rw-r--r--configure.in2
-rw-r--r--src/ui.cc13
-rw-r--r--src/uicmd.cc2
3 files changed, 12 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index e5d0786a..bf419619 100644
--- a/configure.in
+++ b/configure.in
@@ -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
diff --git a/src/ui.cc b/src/ui.cc
index 1bd6217c..e4d6fd46 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -124,6 +124,13 @@ int CustInput::handle(int e)
// 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 @@ void UI::make_status_bar(int ww, int wh)
// 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 @@ void UI::findbar_toggle(bool add)
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();
}
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 190b9e7e..7a01d069 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -429,7 +429,7 @@ static BrowserWindow *UIcmd_tab_new(CustTabs *tabs, int focus)
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();