Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

fileview: hide line numbers and block margin when displaying subrepo data

Also, always show the block margin and size it correctly for the contents, when
not displaying diffs.

Changeset 57511c4415b2…

Parent 6fbe4f700545…

by Steve Borho

Changes to one file · Browse files at 57511c4415b2 Showing diff from parent 6fbe4f700545 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
384
385
386
387
 
 
 
388
389
390
391
392
393
 
394
395
396
 
408
409
410
 
 
 
 
411
412
413
414
415
416
417
418
419
420
 
384
385
386
 
387
388
389
390
391
392
393
394
395
396
397
398
399
 
411
412
413
414
415
416
417
418
 
419
420
 
421
 
422
423
424
@@ -384,13 +384,16 @@
  self.sci.setText(fd.ucontents)   self.sci.setLexer(None)   self.sci.setFont(qtlib.getfont('fontlog').font()) - self.sci._updatemarginwidth() + self.sci.setMarginWidth(1, 0) + self.blk.setVisible(False) + return   elif fd.contents:   lexer = lexers.get_lexer(filename, fd.contents, self)   self.sci.setLexer(lexer)   if lexer is None:   self.sci.setFont(qtlib.getfont('fontlog').font())   self.sci.setText(hglib.tounicode(fd.contents)) + self.blk.setVisible(True)   self.sci._updatemarginwidth()   if self._mode == AnnMode:   self.sci._updateannotation(self._ctx, filename) @@ -408,13 +411,14 @@
  uc = hglib.tounicode(fd.contents) or ''   self.fileDisplayed.emit(uf, uc)   + if self._mode != DiffMode: + self.blk.setVisible(True) + self.blk.syncPageStep() +   if self._mode != DiffMode and fd.contents and fd.olddata: - # Update blk margin   if self.timer.isActive():   self.timer.stop() -   self._fd = fd - self.blk.syncPageStep()   self.timer.start()     #