Fossil

Check-in [38b52a5f]
Login

Check-in [38b52a5f]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge risers must not go straight up to another node on the same rail.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | short-offscreen-risers
Files: files | file ages | folders
SHA1: 38b52a5f0c0a710b1ace6a337f6a1e706294d7a1
User & Date: drh 2016-03-19 15:17:31.728
Context
2016-03-19
15:17
Merge risers must not go straight up to another node on the same rail. ... (Closed-Leaf check-in: 38b52a5f user: drh tags: short-offscreen-risers)
00:55
Update the built-in SQLite to include the "PRAGMA integrity_check" fix. ... (check-in: 9245076e user: drh tags: short-offscreen-risers)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/graph.c.
︙︙
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302

){
  int u;
  u64 mask;
  GraphRow *pLoop;

  if( pParent->mergeOut<0 ){
    u = pParent->aiRiser[pParent->iRail];
    if( u>=0 && u<pChild->idx ){
      /* The thick arrow up to the next primary child of pDesc goes
      ** further up than the thin merge arrow riser, so draw them both
      ** on the same rail. */
      pParent->mergeOut = pParent->iRail;
      pParent->mergeUpto = pChild->idx;
    }else{
      /* The thin merge arrow riser is taller than the thick primary
      ** child riser, so use separate rails. */








|
|








287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302

){
  int u;
  u64 mask;
  GraphRow *pLoop;

  if( pParent->mergeOut<0 ){
    u = pParent->aiRiser[pParent->iRail];
    if( u>=0 && u<pChild->idx && pParent->iRail!=pChild->iRail ){
      /* The thick arrow up to the next primary child of pParent goes
      ** further up than the thin merge arrow riser, so draw them both
      ** on the same rail. */
      pParent->mergeOut = pParent->iRail;
      pParent->mergeUpto = pChild->idx;
    }else{
      /* The thin merge arrow riser is taller than the thick primary
      ** child riser, so use separate rails. */
︙︙