[project @ 2005-03-21 00:50:13 by rjw]

Add shift+toggle feature for short contents. *** HACK ***

svn path=/import/netsurf/; revision=1566
This commit is contained in:
Richard Wilson 2005-03-21 00:50:13 +00:00
parent 8c0cc33e3b
commit 9a76676600
1 changed files with 17 additions and 10 deletions

View File

@ -969,10 +969,12 @@ void ro_gui_window_open(struct gui_window *g, wimp_open *open)
bool toggle_hack = false; bool toggle_hack = false;
int screen_height, screen_width; int screen_height, screen_width;
os_error *error; os_error *error;
int key_down = 0;
int inset = 0;
content = g->bw->current_content; content = g->bw->current_content;
/* check for toggle to full size - NOW FEATURING "TEMPORARY HACK" */ /* check for toggle to full size so we can force to full height for short contents */
state.w = g->window; state.w = g->window;
error = xwimp_get_window_state(&state); error = xwimp_get_window_state(&state);
if (error) { if (error) {
@ -981,16 +983,21 @@ void ro_gui_window_open(struct gui_window *g, wimp_open *open)
warn_user("WimpError", error->errmess); warn_user("WimpError", error->errmess);
return; return;
} }
if ((state.flags & wimp_WINDOW_TOGGLED) && if ((state.flags & wimp_WINDOW_TOGGLED) && // bit 19
(state.flags & wimp_WINDOW_BOUNDED_ONCE) && (state.flags & wimp_WINDOW_BOUNDED_ONCE) && // bit 21
!(state.flags & wimp_WINDOW_FULL_SIZE)) { !(state.flags & wimp_WINDOW_FULL_SIZE)) { // not bit 18
/* Check if we need to perform our hack
*/
ro_gui_screen_size(&screen_width, &screen_height); ro_gui_screen_size(&screen_width, &screen_height);
if ((content->height * 2 * g->option.scale) < screen_height) { /* i can see no way of easily discovering if we were the result of a shift-
open->visible.y0 = 0; * toggle as wimp_WINDOW_PARTIAL_SIZE does not seem to be what we need. As
open->visible.y1 = 0x1000; * such we do the really horrible thing of testing for Shift directly and
height = 0x1000; * decreasing the value accordingly. Yuck. */
xosbyte1(osbyte_SCAN_KEYBOARD, 0 ^ 0x80, 0, &key_down);
if (key_down != 0)
inset = 160 + ro_get_hscroll_height(0);
if ((content->height * 2 * g->option.scale) < screen_height - inset) {
open->visible.y0 = inset;
open->visible.y1 = screen_height;
height = screen_height - inset;
toggle_hack = true; toggle_hack = true;
} }
} }