gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert last change and replace with something a little bit better. The

Browse source 
whole ruler handling will need some deeper inspection.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34636 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-01-26 09:25:29 +00:00
parent 5c3e0f4903
commit af8b7fd367
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-01-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextView.m (-updateRuler): Replace last change with one
that checks whether the text view is the client view of the ruler
and only sets the markers in that case.
2012-01-25 Doug Simons <doug.simons@testplant.com> 2012-01-25 Doug Simons <doug.simons@testplant.com>
* Source/NSTextView.m (-updateRuler): Call setClientView: before * Source/NSTextView.m (-updateRuler): Call setClientView: before

4
Source/NSTextView.m
View file

@ -4577,7 +4577,8 @@ shouldRemoveMarker: (NSRulerMarker *)marker
/* Update ruler view only if told so */ /* Update ruler view only if told so */
if (_tf.uses_ruler && _tf.is_ruler_visible && if (_tf.uses_ruler && _tf.is_ruler_visible &&
(sv = [self enclosingScrollView]) != nil && (sv = [self enclosingScrollView]) != nil &&
(rv = [sv horizontalRulerView]) != nil) (rv = [sv horizontalRulerView]) != nil &&
[rv clientView] == self)
{ {
NSParagraphStyle *paraStyle; NSParagraphStyle *paraStyle;
NSArray *makers; NSArray *makers;
@ -4597,7 +4598,6 @@ shouldRemoveMarker: (NSRulerMarker *)marker
makers = [_layoutManager rulerMarkersForTextView: self makers = [_layoutManager rulerMarkersForTextView: self
paragraphStyle: paraStyle paragraphStyle: paraStyle
ruler: rv]; ruler: rv];
[rv setClientView:self];
[rv setMarkers: makers]; [rv setMarkers: makers];
} }
} }