gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-24 06:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes for bug reported by marcus

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36834 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-07-04 07:54:52 +00:00
parent 242003a698
commit b421bd0e50
5 changed files with 4782 additions and 1937 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-07-04 Richard Frith-Macdonald <rfm@gnu.org>
* config.make.in: Fix error in order of link/include directories
* configure.ac: Change variable names for match make system
* configure: regenerate
* Source/NSView.m: trivial comment format changes
2013-07-03 Eric Wasylishen <ewasylishen@gmail.com>
* Source/Functions.m:

20
Source/NSView.m
View file

@ -2451,8 +2451,9 @@ static void autoresize(CGFloat oldContainerSize,
/*
* If we still need display after displaying the invalid rectangle,
* this means that some subviews still need to display. For opaque subviews
* their invalid rectangle may even overlap the original aRect.
* this means that some subviews still need to display.
* For opaque subviews their invalid rectangle may even overlap the
* original aRect.
* Display any subview that need display.
*/
if (_rFlags.needs_display == YES)
@ -2548,10 +2549,10 @@ static void autoresize(CGFloat oldContainerSize,
/*
* If the rect we are going to display contains the _invalidRect
* then we can empty _invalidRect. Do this before the drawing, as drawRect:
* may change this value.
* FIXME: If the drawn rectangle cuts of a complete part of the _invalidRect,
* we should try to reduce this.
* then we can empty _invalidRect. Do this before the drawing,
* as drawRect: may change this value.
* FIXME: If the drawn rectangle cuts of a complete part of the
* _invalidRect, we should try to reduce this.
*/
if (NSEqualRects(aRect, NSUnionRect(neededRect, aRect)) == YES)
{
@ -2599,12 +2600,13 @@ static void autoresize(CGFloat oldContainerSize,
if (NSIsEmptyRect(isect) == NO)
{
isect = [subview convertRect: isect fromView: self];
[subview displayRectIgnoringOpacity: isect inContext: context];
[subview displayRectIgnoringOpacity: isect
inContext: context];
}
/*
* Is there still something to draw in the subview?
* This keeps the invariant that views further up are marked for redraw
* when ever a view further down needs to redraw.
* This keeps the invariant that views further up are marked
* for redraw when ever a view further down needs to redraw.
*/
if (subview->_rFlags.needs_display == YES)
{

4
config.make.in
View file

@ -2,8 +2,8 @@
# Extra make variables for gui library
#
ADDITIONAL_INCLUDE_DIRS += @ADDITIONAL_INCLUDE_DIRS@
ADDITIONAL_LIB_DIRS += @ADDITIONAL_LIB_DIRS@
CONFIG_SYSTEM_INCL += @CONFIG_SYSTEM_INCL@
CONFIG_SYSTEM_LIB_DIR += @CONFIG_SYSTEM_LIB_DIR@
ADDITIONAL_DEPENDS = @LIBS@
# Build speech and sound.

6672
configure vendored
View file

File diff suppressed because it is too large Load diff

16
configure.ac
View file

@ -54,8 +54,8 @@ AC_CANONICAL_TARGET([])
#--------------------------------------------------------------------
# Add target OS directories as necessary
#--------------------------------------------------------------------
ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
ADDITIONAL_LIB_DIRS="$LDFLAGS"
CONFIG_SYSTEM_INCL="$CPPFLAGS"
CONFIG_SYSTEM_LIB_DIR="$LDFLAGS"
case "$target_os" in
freebsd* | openbsd* )
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@ -133,7 +133,7 @@ AC_ARG_WITH(include-flags,
include_flags="$withval", include_flags="no")
if test ${include_flags} != "no"; then
CPPFLAGS="$CPPFLAGS ${include_flags}"
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS ${include_flags}"
CONFIG_SYSTEM_INCL="$CONFIG_SYSTEM_INCL ${include_flags}"
fi
AC_ARG_WITH(library-flags,
@ -141,7 +141,7 @@ AC_ARG_WITH(library-flags,
library_flags="$withval", library_flags="no")
if test ${library_flags} != "no"; then
LDFLAGS="$LDFLAGS ${library_flags}"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS ${library_flags}"
CONFIG_SYSTEM_LIB_DIR="$CONFIG_SYSTEM_LIB_DIR ${library_flags}"
fi
#--------------------------------------------------------------------
@ -540,11 +540,11 @@ AC_SUBST(GNUSTEP_GUI_MAJOR_VERSION)
AC_SUBST(GNUSTEP_GUI_MINOR_VERSION)
AC_SUBST(GNUSTEP_GUI_SUBMINOR_VERSION)
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
CONFIG_SYSTEM_INCL="$CONFIG_SYSTEM_INCL $GRAPHIC_CFLAGS"
CONFIG_SYSTEM_LIB_DIR="$CONFIG_SYSTEM_LIB_DIR $GRAPHIC_LFLAGS"
AC_SUBST(ADDITIONAL_LIB_DIRS)
AC_SUBST(ADDITIONAL_INCLUDE_DIRS)
AC_SUBST(CONFIG_SYSTEM_LIB_DIR)
AC_SUBST(CONFIG_SYSTEM_INCL)
AC_SUBST(cross_compiling)
#--------------------------------------------------------------------