diff --git a/uppsrc/TCtrlLib/Ruler.cpp b/uppsrc/TCtrlLib/Ruler.cpp index ed3a8f204..ee463dc48 100644 --- a/uppsrc/TCtrlLib/Ruler.cpp +++ b/uppsrc/TCtrlLib/Ruler.cpp @@ -222,7 +222,7 @@ void RulerCtrl::Paint(Draw& draw) enum { SMALL_LIMIT = 100, - TEXT_LIMIT = 50, +// TEXT_LIMIT = 50, TGAP = 3, HGAP = 2, VGAP = 0, @@ -261,7 +261,7 @@ void RulerCtrl::Paint(Draw& draw) rep_count = ceil(pos2 / text_repeat) - floor(pos1 / text_repeat) + 1; } if(!text_step.IsEmpty() && (!text_value.IsEmpty() || text_convert) - && rep_count > 0 && rep_count * text_step.GetCount() <= TEXT_LIMIT) { + && rep_count > 0 /*&& rep_count * text_step.GetCount() <= TEXT_LIMIT*/) { int ix = BinFindIndex(text_step, pos1 - rep_index * text_repeat); int ppos = (is_right ? SMALL_SIZE : cheight - cy - SMALL_SIZE); for(int c = fround(rep_count); --c >= 0; ix = 0, rep_index++) { diff --git a/uppsrc/TCtrlLib/util.h b/uppsrc/TCtrlLib/util.h index 47c8155ac..4bcd3157e 100644 --- a/uppsrc/TCtrlLib/util.h +++ b/uppsrc/TCtrlLib/util.h @@ -1,5 +1,7 @@ NAMESPACE_UPP +#define ASSERT_INDEX(arrayctrl, index) ASSERT(arrayctrl.GetIndexCount() == index) + #define TOOL(x) \ void COMBINE(Tool, x)(Bar& bar); \ void COMBINE(On, x)(); \