comparison connectionitem.cpp @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus
author Chris Cannam
date Thu, 02 Dec 2010 17:55:21 +0000
parents 644bd31e8301
children 8fd71f570884
comparison
equal deleted inserted replaced
152:2b997861174b 153:70fe12873106
74 74
75 float xscale = 100; 75 float xscale = 100;
76 76
77 float yscale = 90; 77 float yscale = 90;
78 float size = 50; 78 float size = 50;
79 float ygap = yscale - size; 79 float ygap = yscale - size - 2;
80 80
81 int p_col = m_parent->column(), p_row = m_parent->row(); 81 int p_col = m_parent->column(), p_row = m_parent->row();
82 int c_col, c_row; 82 int c_col, c_row;
83 if (m_child) { 83 if (m_child) {
84 c_col = m_child->column(); c_row = m_child->row(); 84 c_col = m_child->column(); c_row = m_child->row();