Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-21 06:21:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix scheme and image drawing bugs.

Browse Source 
Bump to 1.1.4rc2.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2003-07-29 02:12:36 +00:00
parent d597ec7b38
commit 520d44ebf6
6 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+8 -2
View File
@@ -1,6 +1,12 @@
CHANGES IN FLTK 1.1.4
CHANGES IN FLTK 1.1.4rc2
- 'Enter' key event on OS X would not set Fl::e_text;
- Images were not clipped properly on MacOS X (STR #114)
- Fl::reload_scheme() and Fl::scheme("foo") incorrectly
called Fl::get_system_colors(). This prevented an
application from setting its own color preferences
(STR #115)
- The 'Enter' key event on OS X would not set Fl::e_text
(STR #???)
- Changed behaviour of fluid to always paste into
a selected group (STR #88)
- Menuitem now changes font, even if fontsize
configure.in
+3 -3
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf"
dnl
dnl "$Id: configure.in,v 1.33.2.31.2.101 2003/07/12 04:20:48 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.102 2003/07/29 02:12:36 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@@ -35,7 +35,7 @@ dnl FLTK library versions...
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=1
FL_PATCH_VERSION=4
FL_RELEASE_VERSION=rc1
FL_RELEASE_VERSION=rc2
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
AC_SUBST(FL_MAJOR_VERSION)
@@ -852,5 +852,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config
dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.101 2003/07/12 04:20:48 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.102 2003/07/29 02:12:36 easysw Exp $".
dnl
fltk.spec
+3 -3
View File
@@ -1,5 +1,5 @@
#
# "$Id: fltk.spec,v 1.1.2.9.2.23 2003/05/26 14:31:59 easysw Exp $"
# "$Id: fltk.spec,v 1.1.2.9.2.24 2003/07/29 02:12:36 easysw Exp $"
#
# RPM spec file for FLTK.
#
@@ -23,7 +23,7 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
%define version 1.1.4rc1
%define version 1.1.4rc2
%define release 0
%define prefix /usr
@@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/doc/fltk/*
#
# End of "$Id: fltk.spec,v 1.1.2.9.2.23 2003/05/26 14:31:59 easysw Exp $".
# End of "$Id: fltk.spec,v 1.1.2.9.2.24 2003/07/29 02:12:36 easysw Exp $".
#
fluid/fluid.cxx
+4 -2
View File
@@ -1,5 +1,5 @@
//
// "$Id: fluid.cxx,v 1.15.2.13.2.39 2003/07/19 06:10:20 matthiaswm Exp $"
// "$Id: fluid.cxx,v 1.15.2.13.2.40 2003/07/29 02:12:36 easysw Exp $"
//
// FLUID main entry for the Fast Light Tool Kit (FLTK).
//
@@ -842,6 +842,8 @@ int main(int argc,char **argv) {
fl_register_images();
if (!compile_only) Fl::scheme(NULL);
make_main_window();
#ifdef __APPLE__
@@ -884,5 +886,5 @@ int main(int argc,char **argv) {
}
//
// End of "$Id: fluid.cxx,v 1.15.2.13.2.39 2003/07/19 06:10:20 matthiaswm Exp $".
// End of "$Id: fluid.cxx,v 1.15.2.13.2.40 2003/07/29 02:12:36 easysw Exp $".
//
src/Fl_Image.cxx
+14 -9
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Image.cxx,v 1.5.2.3.2.29 2003/01/30 21:41:55 easysw Exp $"
// "$Id: Fl_Image.cxx,v 1.5.2.3.2.30 2003/07/29 02:12:36 easysw Exp $"
//
// Image drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -332,17 +332,22 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
#elif defined(__APPLE__)
if (mask) {
Rect src, dst;
src.left = 0; src.right = w();
src.top = 0; src.bottom = h();
dst.left = X; dst.right = X+w();
dst.top = Y; dst.bottom = Y+h();
// MRS: STR #114 says we should be using cx, cy, W, and H...
// src.left = 0; src.right = w();
// src.top = 0; src.bottom = h();
// dst.left = X; dst.right = X+w();
// dst.top = Y; dst.bottom = Y+h();
src.left = cx; src.right = cx+W;
src.top = cx; src.bottom = cy+H;
dst.left = X; dst.right = X+W;
dst.top = Y; dst.bottom = Y+H;
RGBColor rgb;
rgb.red = 0xffff; rgb.green = 0xffff; rgb.blue = 0xffff;
RGBBackColor(&rgb);
rgb.red = 0x0000; rgb.green = 0x0000; rgb.blue = 0x0000;
RGBForeColor(&rgb);
#if 0
# if 0
// MRS: This *should* work, but doesn't on my system (iBook); change to
// "#if 1" and restore the corresponding code in Fl_Bitmap.cxx
// to test the real alpha channel support.
@@ -350,12 +355,12 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
GetPortBitMapForCopyBits((GrafPtr)mask),
GetPortBitMapForCopyBits(GetWindowPort(fl_window)),
&src, &src, &dst, blend, NULL);
#else // Fallback to screen-door transparency...
# else // Fallback to screen-door transparency...
CopyMask(GetPortBitMapForCopyBits((GrafPtr)id),
GetPortBitMapForCopyBits((GrafPtr)mask),
GetPortBitMapForCopyBits(GetWindowPort(fl_window)),
&src, &src, &dst);
#endif // 0
# endif // 0
} else {
fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy);
}
@@ -392,5 +397,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) {
//
// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.29 2003/01/30 21:41:55 easysw Exp $".
// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.30 2003/07/29 02:12:36 easysw Exp $".
//
src/Fl_get_system_colors.cxx
+2 -4
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.21 2003/07/12 04:20:48 easysw Exp $"
// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.22 2003/07/29 02:12:36 easysw Exp $"
//
// System color support for the Fast Light Tool Kit (FLTK).
//
@@ -247,8 +247,6 @@ int Fl::scheme(const char *s) {
int Fl::reload_scheme() {
Fl_Window *win;
get_system_colors();
if (scheme_ && !strcasecmp(scheme_, "plastic")) {
// Update the tile image to match the background color...
uchar r, g, b;
@@ -323,5 +321,5 @@ int Fl::reload_scheme() {
//
// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.21 2003/07/12 04:20:48 easysw Exp $".
// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.22 2003/07/29 02:12:36 easysw Exp $".
//