December 2007 - Dillo-dev - lists.mailman3.com

[PATCH] tweak TEXTAREA vertical alignment

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 05:29:28PM +0000, Jeremy Henty wrote: > > This is a layout tweak. It moves the baseline of a > FltkMultiLineTextResource from the top of the text to the bottom of > the top line. Committed. -- Cheers Jorge.-

Dec. 17, 2007

[PATCH] reset TEXTAREA controls

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 04:17:30PM +0000, Jeremy Henty wrote: > > This implements the DILLO_HTML_INPUT_TEXTAREA case in > Html_reset_input() . Committed. -- Cheers Jorge.-

Dec. 17, 2007

[patch] resize progress indicators dynamically

by Johannes.Hofmann＠gmx.de

Hello, this patch resizes the progress indicators as needed. I don't like the constant "+ 4". Any ideas? Regards, Johannes diff -r 0a8a112b8e48 src/ui.cc --- a/src/ui.cc Mon Dec 17 14:07:38 2007 +0100 +++ b/src/ui.cc Mon Dec 17 19:33:53 2007 +0100 @@ -409,18 +409,24 @@ PackedGroup *UI::make_location() */ PackedGroup *UI::make_progress_bars(int wide, int thin_up) { + int width, height; + ProgBox = new PackedGroup(0,0,0,0); ProgBox->begin(); // Images - IProg = new InvisibleBox(0,0,pr_w,0, + IProg = new InvisibleBox(0,0,0,0, wide ? "Images\n0 of 0" : "0 of 0"); IProg->box(thin_up ? THIN_UP_BOX : EMBOSSED_BOX); IProg->labelcolor(GRAY10); + IProg->measure_label(width, height); + IProg->resize(width + 4, height + 4); // Page - PProg = new InvisibleBox(0,0,pr_w,0, + PProg = new InvisibleBox(0,0,0,0, wide ? "Page\n0.0KB" : "0.0KB"); PProg->box(thin_up ? THIN_UP_BOX : EMBOSSED_BOX); PProg->labelcolor(GRAY10); + PProg->measure_label(width, height); + PProg->resize(width + 4, height + 4); ProgBox->type(PackedGroup::ALL_CHILDREN_VERTICAL); ProgBox->end(); @@ -471,24 +477,24 @@ Group *UI::make_panel(int ww) if (PanelSize == P_tiny) { if (Small_Icons) - xpos = 0, bw = 22, bh = 22, fh = 0, lh = 22, lbl = 0, pr_w = 45; + xpos = 0, bw = 22, bh = 22, fh = 0, lh = 22, lbl = 0; else - xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0, pr_w = 45; + xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0; } else if (PanelSize == P_small) { if (Small_Icons) - xpos = 0, bw = 20, bh = 20, fh = 0, lh = 20, lbl = 0, pr_w = 45; + xpos = 0, bw = 20, bh = 20, fh = 0, lh = 20, lbl = 0; else - xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0, pr_w = 45; + xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0; } else if (PanelSize == P_medium) { if (Small_Icons) - xpos = 0, bw = 42, bh = 36, fh = 0, lh = 22, lbl = 1, pr_w = 60; + xpos = 0, bw = 42, bh = 36, fh = 0, lh = 22, lbl = 1; else - xpos = 0, bw = 45, bh = 45, fh = 0, lh = 28, lbl = 1, pr_w = 60; + xpos = 0, bw = 45, bh = 45, fh = 0, lh = 28, lbl = 1; } else { // P_large if (Small_Icons) - xpos = 0, bw = 42, bh = 36, fh = 22, lh = 22, lbl = 1, pr_w = 60; + xpos = 0, bw = 42, bh = 36, fh = 22, lh = 22, lbl = 1; else - xpos = 0, bw = 45, bh = 45, fh = 28, lh = 28, lbl = 1, pr_w = 60; + xpos = 0, bw = 45, bh = 45, fh = 28, lh = 28, lbl = 1; } if (PanelSize == P_tiny) { @@ -767,6 +773,7 @@ void UI::set_page_prog(size_t nbytes, in void UI::set_page_prog(size_t nbytes, int cmd) { char str[32]; + int width, height; if (cmd == 0) { PProg->deactivate(); @@ -779,6 +786,8 @@ void UI::set_page_prog(size_t nbytes, in str[0] = '\0'; } PProg->copy_label(str); + PProg->measure_label(width, height); + PProg->resize(width + 4, height + 4); PProg->redraw_label(); } } @@ -790,6 +799,7 @@ void UI::set_img_prog(int n_img, int t_i void UI::set_img_prog(int n_img, int t_img, int cmd) { char str[32]; + int width, height; if (cmd == 0) { IProg->deactivate(); @@ -802,6 +812,8 @@ void UI::set_img_prog(int n_img, int t_i str[0] = '\0'; } IProg->copy_label(str); + IProg->measure_label(width, height); + IProg->resize(width + 4, height + 4); IProg->redraw_label(); } } diff -r 0a8a112b8e48 src/ui.hh --- a/src/ui.hh Mon Dec 17 14:07:38 2007 +0100 +++ b/src/ui.hh Mon Dec 17 19:33:53 2007 +0100 @@ -48,7 +48,7 @@ class UI : public fltk::Window { int MainIdx; // Panel customization variables int PanelSize, CuteColor, Small_Icons; - int xpos, bw, bh, fh, lh, lbl, pr_w; + int xpos, bw, bh, fh, lh, lbl; // TODO: Hack for fullscreen mode int Panel_h, Status_h;

Dec. 17, 2007

[PATCH] tweak TEXTAREA vertical alignment

by onepoint＠starurchin.org

This is a layout tweak. It moves the baseline of a FltkMultiLineTextResource from the top of the text to the bottom of the top line. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-17 16:00:34.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-17 17:14:21.000000000 +0000 @@ -571,11 +571,14 @@ void FltkMultiLineTextResource::sizeRequ if (style) { FltkFont *font = (FltkFont*)style->font; requisition->width = - (int)::fltk::getwidth ("M", 1) * numCols - + 2 * RELIEF_X_THICKNESS; - requisition->ascent = RELIEF_Y_THICKNESS; + (int)::fltk::getwidth ("M", 1) * numCols + + 2 * RELIEF_X_THICKNESS; + requisition->ascent = + font->ascent + RELIEF_Y_THICKNESS; requisition->descent = - (font->ascent + font->descent) * numRows + RELIEF_Y_THICKNESS; + font->descent + + (font->ascent + font->descent) * (numRows - 1) + + RELIEF_Y_THICKNESS; } else { requisition->width = 1; requisition->ascent = 1;

Dec. 17, 2007

[PATCH] reset TEXTAREA controls

by onepoint＠starurchin.org

This implements the DILLO_HTML_INPUT_TEXTAREA case in Html_reset_input() . Regards, Jeremy Henty diff -pru -- dillo2-ref/src/html.cc dillo2-cur/src/html.cc --- dillo2-ref/src/html.cc 2007-12-17 02:05:08.000000000 +0000 +++ dillo2-cur/src/html.cc 2007-12-17 14:50:38.000000000 +0000 @@ -3633,10 +3633,11 @@ static void Html_reset_input(DilloHtmlIn break; case DILLO_HTML_INPUT_TEXTAREA: if (input->init_str != NULL) { -// int pos = 0; -// gtk_editable_delete_text(GTK_EDITABLE(input->widget), 0, -1); -// gtk_editable_insert_text(GTK_EDITABLE(input->widget), input->init_str, -// strlen(input->init_str), &pos); + MultiLineTextResource *textres; + textres = + (MultiLineTextResource*) + ((Embed*)input->widget)->getResource(); + textres->setText(input->init_str ? input->init_str : ""); } break; default:

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by Johannes.Hofmann＠gmx.de

On Mon, Dec 17, 2007 at 03:19:13PM +0000, Jeremy Henty wrote: > On Mon, Dec 17, 2007 at 10:07:09AM -0300, Jorge Arellano Cid wrote: > > > Please note that the enter key is selecting text instead of > > adding a new line... > > It's in the TO DO, along with the need for a scroller (and thanks for > the example page, BTW). I have some tweaks and cleanups to submit > first. Just tried to use the TextEditor widget from fltk (see test/input.cxx in the fltk tarball). It has scrollbar support built in and perhaps other useful stuff. Unfortunately it crashes on division by zero here... Regards, Johannes > > Regards, > > Jeremy Henty > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

On Mon, Dec 17, 2007 at 10:07:09AM -0300, Jorge Arellano Cid wrote: > Please note that the enter key is selecting text instead of > adding a new line... It's in the TO DO, along with the need for a scroller (and thanks for the example page, BTW). I have some tweaks and cleanups to submit first. Regards, Jeremy Henty

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 02:21:58AM +0000, Jeremy Henty wrote: > > This patch makes TEXTAREA controls submit their contents when their > form is activated. Note that I reworked the handling of the embed and > widget members of the form structure for TEXTAREA controls. This was > because I was getting crashes and corruption when the form attempted > to submit itself. I think the various coercions between (void *), > (Widget *) and (Embed *) were going wrong. Changing things so that > widget == embed is also more consistent with the way the other > embedded form controls are handled. Yes, it looks much better. Committed. Please note that the enter key is selecting text instead of adding a new line... -- Cheers Jorge.-

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 02:21:58AM +0000, Jeremy Henty wrote: > > This patch makes TEXTAREA controls submit their contents when their > form is activated. Note that I reworked the handling of the embed and > widget members of the form structure for TEXTAREA controls. This was > because I was getting crashes and corruption when the form attempted > to submit itself. I think the various coercions between (void *), > (Widget *) and (Embed *) were going wrong. Changing things so that > widget == embed is also more consistent with the way the other > embedded form controls are handled. Here goes the attached page... -- Cheers Jorge.-

Dec. 17, 2007

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource

by jcid＠dillo.org

On Sun, Dec 16, 2007 at 11:08:06PM +0000, Jeremy Henty wrote: > On Sun, Dec 16, 2007 at 10:56:28PM +0000, Jeremy Henty (ie. *me*) > wrote: > > > OK, here's the patch to dw2. I'll follow up with the (extremely > > short) patch to dillo2. > > Following up as promised... Committed. Please note that the multiline widget should be embedded inside a scroller. Something like what firefox does with the attached page. Disclaimer: I haven't checked whether this is easy or not! :-) -- Cheers Jorge.-

Dec. 17, 2007