diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.cpp b/uppsrc/ScatterCtrl/ScatterCtrl.cpp index 23b376e16..ac7a4bf91 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.cpp +++ b/uppsrc/ScatterCtrl/ScatterCtrl.cpp @@ -438,7 +438,7 @@ ScatterCtrl::ScatterCtrl() : offset(10,12), copyRatio(1) lastRefresh_ms = Null; maxRefresh_ms = 500; highlighting = false; -ShowInfo().ShowContextMenu().ShowPropertiesDlg(); + ShowInfo().ShowContextMenu().ShowPropertiesDlg(); } END_UPP_NAMESPACE \ No newline at end of file diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.usc b/uppsrc/ScatterCtrl/ScatterCtrl.usc index c1b64fbcd..5ba3a9612 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.usc +++ b/uppsrc/ScatterCtrl/ScatterCtrl.usc @@ -62,7 +62,11 @@ ctrl ScatterCtrl { textsize = GetTextSize(.SetTitle, .SetTitleFont); if(.SetTitle == "") textsize.cy = 0; - w.DrawRect(.SetPlotAreaLeftMargin-1, .SetPlotAreaTopMargin - 1 + textsize.cy, sz.cx - (.SetPlotAreaLeftMargin + .SetPlotAreaRightMargin) + 2, - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) + 2 - textsize.cy + sz.cy, :Gray); + w.DrawRect(.SetPlotAreaLeftMargin - 1, + .SetPlotAreaTopMargin - 1 + textsize.cy, + sz.cx - (.SetPlotAreaLeftMargin + .SetPlotAreaRightMargin) + 2, + - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) + 2 - textsize.cy + sz.cy, + :Gray); aw = 6; if(.SetAxisWidth >= 6) aw = .SetAxisWidth; @@ -73,9 +77,9 @@ ctrl ScatterCtrl { .SetAxisColor); gx0 = .SetPlotAreaLeftMargin; - gy0 = .SetPlotAreaTopMargin + textsize.cy; + gy0 = .SetPlotAreaTopMargin + textsize.cy + 1; gwidth = sz.cx - (.SetPlotAreaLeftMargin + .SetPlotAreaRightMargin); - gheight = sz.cy - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) - textsize.cy; + gheight = sz.cy - (.SetPlotAreaTopMargin + .SetPlotAreaBottomMargin) - textsize.cy - 1; w.DrawRect(gx0, gy0, gwidth, gheight, .SetPlotAreaColor); w.DrawLine(gx0, gy0 + gheight, gx0 + gwidth*0.25, gy0 + gheight*0.5, 2, :SLtRed);