mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More cleanup of GTK+ scheme - menu buttons now use the new look-n-feel,

Browse Source 
and I also fixed the radio button offset for the plastic scheme.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5506 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2006-10-03 23:08:49 +00:00
parent 7febae3f9e
commit 3c03eb67a0
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fl_Light_Button.cxx
View File

@ -122,7 +122,7 @@ void Fl_Light_Button::draw() {
if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) { if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) {
fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.5)); fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.5));
fl_arc(x() + tdx, y() + tdy, tW + 1, tW + 1, 60.0, 180.0); fl_arc(x() + tdx, y() + tdy, tW + 1, tW + 1, 60.0, 180.0);
} else fl_color(col); }
} }
break; break;
default : default :

26
src/Fl_Menu.cxx
View File

@ -3,7 +3,7 @@
// //
// Menu code for the Fast Light Tool Kit (FLTK). // Menu code for the Fast Light Tool Kit (FLTK).
// //
// Copyright 1998-2005 by Bill Spitzak and others. // Copyright 1998-2006 by Bill Spitzak and others.
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public // modify it under the terms of the GNU Library General Public
@ -36,6 +36,7 @@
#include <FL/Fl_Menu_.H> #include <FL/Fl_Menu_.H>
#include <FL/fl_draw.H> #include <FL/fl_draw.H>
#include <stdio.h> #include <stdio.h>
#include "flstring.h"
#ifdef __APPLE__ #ifdef __APPLE__
# include <Carbon/Carbon.h> # include <Carbon/Carbon.h>
@ -174,10 +175,22 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
if (flags & FL_MENU_RADIO) { if (flags & FL_MENU_RADIO) {
fl_draw_box(FL_ROUND_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR); fl_draw_box(FL_ROUND_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR);
if (value()) { if (value()) {
fl_color(labelcolor_);
int tW = (W - Fl::box_dw(FL_ROUND_DOWN_BOX)) / 2 + 1; int tW = (W - Fl::box_dw(FL_ROUND_DOWN_BOX)) / 2 + 1;
if ((W - tW) & 1) tW++; // Make sure difference is even to center if ((W - tW) & 1) tW++; // Make sure difference is even to center
int td = Fl::box_dx(FL_ROUND_DOWN_BOX) + 1; int td = Fl::box_dx(FL_ROUND_DOWN_BOX) + 1;
if (Fl::scheme()) {
// Offset the radio circle...
td ++;
if (!strcmp(Fl::scheme(), "gtk+")) {
fl_color(FL_SELECTION_COLOR);
tW --;
fl_pie(x + td + 1, y + d + td - 1, tW + 3, tW + 3, 0.0, 360.0);
fl_arc(x + td + 1, y + d + td - 1, tW + 3, tW + 3, 0.0, 360.0);
fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2));
} else fl_color(labelcolor_);
} else fl_color(labelcolor_);
switch (tW) { switch (tW) {
// Larger circles draw fine... // Larger circles draw fine...
default : default :
@ -203,11 +216,20 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
fl_rectf(x + td + 2, y + d + td, tW, tW); fl_rectf(x + td + 2, y + d + td, tW, tW);
break; break;
} }
if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) {
fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.5));
fl_arc(x + td + 2, y + d + td, tW + 1, tW + 1, 60.0, 180.0);
}
} }
} else { } else {
fl_draw_box(FL_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR); fl_draw_box(FL_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR);
if (value()) { if (value()) {
if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) {
fl_color(FL_SELECTION_COLOR);
} else {
fl_color(labelcolor_); fl_color(labelcolor_);
}
int tx = x + 5; int tx = x + 5;
int tw = W - 6; int tw = W - 6;
int d1 = tw/3; int d1 = tw/3;