Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-07 09:13:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

In order to make the whitte text field at the bottom left of the

Browse Source 
Help Dialog clearer, I added a magnifying glass in front of the
field sybolising "search".

I made the scaleable magnifying glass available as a symbol via
"@search"

I added yet another symbol that draw a vectorized version of
the FLTK logo. Available via "@FLTK".

Lastly, I changed the 'symbol' test program to show the additional
symbols, and added a slider to changae the relative symbol size.

I hope the new symbols look good enough on other platforms, too. I
tested only OS X.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3479 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2004-07-04 06:49:34 +00:00
parent 0384c86957
commit 47276e733d
6 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Help_Dialog.cxx
+12 -4
View File
@@ -114,7 +114,7 @@ inline void Fl_Help_Dialog::cb_find__i(Fl_Input*, void*) {
find_pos_ = view_->find(find_->value(), find_pos_);
}
void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_find__i(o,v);
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_find__i(o,v);
}
Fl_Help_Dialog::Fl_Help_Dialog() {
@@ -164,9 +164,17 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
o->labelsize(16);
o->callback((Fl_Callback*)cb_larger_);
}
{ Fl_Input* o = find_ = new Fl_Input(10, 350, 265, 25);
o->callback((Fl_Callback*)cb_find_);
o->when(FL_WHEN_ENTER_KEY_ALWAYS);
{ Fl_Group* o = new Fl_Group(10, 350, 265, 25);
o->box(FL_DOWN_BOX);
o->color(FL_BACKGROUND2_COLOR);
{ Fl_Input* o = find_ = new Fl_Input(35, 352, 238, 21, "@search");
o->tooltip("find text in document");
o->box(FL_FLAT_BOX);
o->labelsize(13);
o->callback((Fl_Callback*)cb_find_);
o->when(FL_WHEN_ENTER_KEY_ALWAYS);
}
o->end();
}
o->end();
}
src/Fl_Help_Dialog.fl
+10 -5
View File
@@ -17,7 +17,7 @@ class FL_EXPORT Fl_Help_Dialog {open
} {
Fl_Window window_ {
label {Help Dialog} open
private xywh {398 65 530 385} type Double hide resizable
private xywh {398 65 530 385} type Double resizable visible
} {
Fl_Group view_ {
callback {if (view_->changed())
@@ -48,7 +48,7 @@ else if (view_->filename())
{
strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
line_[index_] = view_->topline();
}} open selected
}} open
private xywh {10 10 510 330} box DOWN_BOX selection_color 15 resizable
code0 {\#include <FL/Fl_Help_View.H>}
class Fl_Help_View
@@ -115,9 +115,14 @@ if (view_->textsize() >= 18)
smaller_->activate();}
private tooltip {Make the help text larger.} xywh {320 350 25 25} labelfont 1 labelsize 16
}
Fl_Input find_ {
callback {find_pos_ = view_->find(find_->value(), find_pos_);}
private xywh {10 350 265 25} when 10
Fl_Group {} {open
xywh {10 350 265 25} box DOWN_BOX color 7
} {
Fl_Input find_ {
label {@search}
callback {find_pos_ = view_->find(find_->value(), find_pos_);} selected
private tooltip {find text in document} xywh {35 352 238 21} box FLAT_BOX labelsize 13 when 10
}
}
}
code {back_->deactivate();
src/fl_symbols.cxx
+49 -2
View File
@@ -1,5 +1,5 @@
//
// "$Id: fl_symbols.cxx,v 1.8.2.3.2.8 2004/04/11 04:39:00 easysw Exp $"
// "$Id: fl_symbols.cxx,v 1.8.2.3.2.9 2004/07/04 06:49:33 matthiaswm Exp $"
//
// Symbol drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -171,6 +171,51 @@ static void rectangle(double x,double y,double x2,double y2,Fl_Color col) {
/* The drawing routines */
static void draw_fltk(Fl_Color col)
{
fl_color(col);
// F fill
BP; vv(-2.0, -0.5); vv(-1.0, -0.5); vv(-1.0, -0.3); vv(-1.8, -0.3);
vv(-1.8, -0.1); vv(-1.2, -0.1); vv(-1.2, 0.1); vv(-1.8, 0.1);
vv(-1.8, 0.5); vv(-2.0, 0.5); EP;
// L fill
BP; vv(-1.0, -0.5); vv(-0.8, -0.5); vv(-0.8, 0.3); vv(0.0, 0.3);
vv(0.0, 0.5); vv(-1.0, 0.5); EP;
// T outline
BP; vv(-0.1, -0.5); vv(1.1, -0.5); vv(1.1, -0.3); vv(0.6, -0.3);
vv(0.6, 0.5); vv(0.4, 0.5); vv(0.4, -0.3); vv(-0.1, -0.3); EP;
// K outline
BP; vv(1.1, -0.5); vv(1.3, -0.5); vv(1.3, -0.15); vv(1.70, -0.5);
vv(2.0, -0.5); vv(1.43, 0.0); vv(2.0, 0.5); vv(1.70, 0.5);
vv(1.3, 0.15); vv(1.3, 0.5); vv(1.1, 0.5); EP;
set_outline_color(col);
// F outline
BC; vv(-2.0, -0.5); vv(-1.0, -0.5); vv(-1.0, -0.3); vv(-1.8, -0.3);
vv(-1.8, -0.1); vv(-1.2, -0.1); vv(-1.2, 0.1); vv(-1.8, 0.1);
vv(-1.8, 0.5); vv(-2.0, 0.5); EC;
// L outline
BC; vv(-1.0, -0.5); vv(-0.8, -0.5); vv(-0.8, 0.3); vv(0.0, 0.3);
vv(0.0, 0.5); vv(-1.0, 0.5); EC;
// T outline
BC; vv(-0.1, -0.5); vv(1.1, -0.5); vv(1.1, -0.3); vv(0.6, -0.3);
vv(0.6, 0.5); vv(0.4, 0.5); vv(0.4, -0.3); vv(-0.1, -0.3); EC;
// K outline
BC; vv(1.1, -0.5); vv(1.3, -0.5); vv(1.3, -0.15); vv(1.70, -0.5);
vv(2.0, -0.5); vv(1.43, 0.0); vv(2.0, 0.5); vv(1.70, 0.5);
vv(1.3, 0.15); vv(1.3, 0.5); vv(1.1, 0.5); EC;
}
static void draw_search(Fl_Color col)
{
fl_color(col);
BP; vv(.4, .13); vv(1.0, .73); vv(.73, 1.0); vv(.13, .4); EP;
set_outline_color(col);
fl_line_style(FL_SOLID, 3, 0);
BC; fl_circle(-.2, -.2, .8); EC;
fl_line_style(FL_SOLID, 1, 0);
BC; vv(.4, .13); vv(1.0, .73); vv(.73, 1.0); vv(.13, .4); EC;
}
static void draw_arrow1(Fl_Color col)
{
fl_color(col);
@@ -358,8 +403,10 @@ static void fl_init_symbols(void) {
fl_add_symbol("UpArrow", draw_uparrow, 1);
fl_add_symbol("DnArrow", draw_downarrow, 1);
fl_add_symbol("||", draw_doublebar, 1);
fl_add_symbol("search", draw_search, 1);
fl_add_symbol("FLTK", draw_fltk, 1);
}
//
// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.8 2004/04/11 04:39:00 easysw Exp $".
// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.9 2004/07/04 06:49:33 matthiaswm Exp $".
//