mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
Revert last change and replace with something a little bit better. The
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:
parent
3e7c9bceef
commit
2d2026e7fc
2 changed files with 8 additions and 2 deletions
|
@ -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>
|
||||
|
||||
* Source/NSTextView.m (-updateRuler): Call setClientView: before
|
||||
|
|
|
@ -4577,7 +4577,8 @@ shouldRemoveMarker: (NSRulerMarker *)marker
|
|||
/* Update ruler view only if told so */
|
||||
if (_tf.uses_ruler && _tf.is_ruler_visible &&
|
||||
(sv = [self enclosingScrollView]) != nil &&
|
||||
(rv = [sv horizontalRulerView]) != nil)
|
||||
(rv = [sv horizontalRulerView]) != nil &&
|
||||
[rv clientView] == self)
|
||||
{
|
||||
NSParagraphStyle *paraStyle;
|
||||
NSArray *makers;
|
||||
|
@ -4597,7 +4598,6 @@ shouldRemoveMarker: (NSRulerMarker *)marker
|
|||
makers = [_layoutManager rulerMarkersForTextView: self
|
||||
paragraphStyle: paraStyle
|
||||
ruler: rv];
|
||||
[rv setClientView:self];
|
||||
[rv setMarkers: makers];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue