Skip to content

P
proview
Commit a3f601f2 authored by Claes pwr46/data0/x4-6-0's avatar Claes pwr46/data0/x4-6-0
Browse files
Options

Text extent calculation adjusted

parent 9c738972
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 20 deletions
xtt/lib/flow/gtk/flow_draw_gtk.cpp
View file @ a3f601f2
...@@ -1266,7 +1266,7 @@ int FlowDrawGtk::text_erase_pango( FlowCtx *ctx, int x, int y, char *text, int l ...@@ -1266,7 +1266,7 @@ int FlowDrawGtk::text_erase_pango( FlowCtx *ctx, int x, int y, char *text, int l
gdk_draw_rectangle( window, gdk_draw_rectangle( window,
gcs[flow_eDrawType_LineErase][idx], 1, gcs[flow_eDrawType_LineErase][idx], 1,
x, y - 0.8 / PANGO_SCALE * h, w / PANGO_SCALE, h / PANGO_SCALE); x, y - 0.8 / PANGO_SCALE * h, w / PANGO_SCALE, h / PANGO_SCALE * 1.2);
// pango_renderer_draw_layout( pr, layout, PANGO_SCALE * x, PANGO_SCALE * y - h * 0.8); // pango_renderer_draw_layout( pr, layout, PANGO_SCALE * x, PANGO_SCALE * y - h * 0.8);
gdk_pango_renderer_set_drawable( GDK_PANGO_RENDERER(pr), 0); gdk_pango_renderer_set_drawable( GDK_PANGO_RENDERER(pr), 0);
......
xtt/lib/flow/src/flow_annot.cpp
View file @ a3f601f2
...@@ -80,6 +80,7 @@ void FlowAnnot::print( void *pos, void *node, int highlight) ...@@ -80,6 +80,7 @@ void FlowAnnot::print( void *pos, void *node, int highlight)
break; break;
case flow_eAnnotType_MultiLine: case flow_eAnnotType_MultiLine:
{ {
double z_h;
int z_width, z_height; int z_width, z_height;
int z_x = int( p.print_z_x + ((FlowPoint *)pos)->print_z_x); int z_x = int( p.print_z_x + ((FlowPoint *)pos)->print_z_x);
int z_y = int( p.print_z_y + ((FlowPoint *)pos)->print_z_y); int z_y = int( p.print_z_y + ((FlowPoint *)pos)->print_z_y);
...@@ -87,15 +88,15 @@ void FlowAnnot::print( void *pos, void *node, int highlight) ...@@ -87,15 +88,15 @@ void FlowAnnot::print( void *pos, void *node, int highlight)
int line_cnt = 0; int line_cnt = 0;
char *line = ((FlowNode *) node)->annotv[number]; char *line = ((FlowNode *) node)->annotv[number];
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, text_size, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, text_size, &z_width, &z_height,
ctx->print_zoom_factor / ctx->base_zoom_factor * (8+2*text_size)); ctx->print_zoom_factor / ctx->base_zoom_factor * (12+2*text_size));
z_height = int( ctx->print_zoom_factor / ctx->base_zoom_factor * z_height); z_h = ctx->print_zoom_factor / ctx->base_zoom_factor * z_height;
for ( s = ((FlowNode *) node)->annotv[number]; *s; s++) for ( s = ((FlowNode *) node)->annotv[number]; *s; s++)
{ {
if ( *s == 10) if ( *s == 10)
{ {
if ( len) if ( len)
ctx->current_print->text( z_x, z_y + line_cnt * z_height, line, len, ctx->current_print->text( z_x, z_y + line_cnt * z_h, line, len,
draw_type, size); draw_type, size);
len = 0; len = 0;
line = s+1; line = s+1;
...@@ -105,7 +106,7 @@ void FlowAnnot::print( void *pos, void *node, int highlight) ...@@ -105,7 +106,7 @@ void FlowAnnot::print( void *pos, void *node, int highlight)
len++; len++;
} }
if ( len) if ( len)
ctx->current_print->text( z_x, z_y + line_cnt * z_height, line, ctx->current_print->text( z_x, z_y + line_cnt * z_h, line,
len, draw_type, size); len, draw_type, size);
break; break;
} }
...@@ -197,7 +198,7 @@ void FlowAnnot::draw( void *pos, int highlight, int hot, void *node) ...@@ -197,7 +198,7 @@ void FlowAnnot::draw( void *pos, int highlight, int hot, void *node)
int line_cnt = 0; int line_cnt = 0;
char *line = ((FlowNode *) node)->annotv[number]; char *line = ((FlowNode *) node)->annotv[number];
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, idx, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, idx, &z_width, &z_height,
tsize(text_size)); tsize(text_size));
for ( s = ((FlowNode *) node)->annotv[number]; *s; s++) for ( s = ((FlowNode *) node)->annotv[number]; *s; s++)
{ {
...@@ -263,7 +264,7 @@ void FlowAnnot::erase( void *pos, int hot, void *node) ...@@ -263,7 +264,7 @@ void FlowAnnot::erase( void *pos, int hot, void *node)
int line_cnt = 0; int line_cnt = 0;
char *line = ((FlowNode *) node)->annotv[number]; char *line = ((FlowNode *) node)->annotv[number];
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, idx, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, idx, &z_width, &z_height,
tsize(text_size)); tsize(text_size));
for ( s = ((FlowNode *) node)->annotv[number]; *s; s++) for ( s = ((FlowNode *) node)->annotv[number]; *s; s++)
{ {
...@@ -329,7 +330,7 @@ void FlowAnnot::draw_inverse( void *pos, int hot, void *node) ...@@ -329,7 +330,7 @@ void FlowAnnot::draw_inverse( void *pos, int hot, void *node)
int line_cnt = 0; int line_cnt = 0;
char *line = ((FlowNode *) node)->annotv[number]; char *line = ((FlowNode *) node)->annotv[number];
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, idx, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, idx, &z_width, &z_height,
tsize(text_size)); tsize(text_size));
for ( s = ((FlowNode *) node)->annotv[number]; *s; s++) for ( s = ((FlowNode *) node)->annotv[number]; *s; s++)
{ {
...@@ -388,7 +389,7 @@ void FlowAnnot::nav_draw( void *pos, int highlight, void *node) ...@@ -388,7 +389,7 @@ void FlowAnnot::nav_draw( void *pos, int highlight, void *node)
int line_cnt = 0; int line_cnt = 0;
char *line = ((FlowNode *) node)->annotv[number]; char *line = ((FlowNode *) node)->annotv[number];
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, idx, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, idx, &z_width, &z_height,
nav_tsize( text_size)); nav_tsize( text_size));
for ( s = ((FlowNode *) node)->annotv[number]; *s; s++) for ( s = ((FlowNode *) node)->annotv[number]; *s; s++)
{ {
...@@ -446,7 +447,7 @@ void FlowAnnot::nav_erase( void *pos, void *node) ...@@ -446,7 +447,7 @@ void FlowAnnot::nav_erase( void *pos, void *node)
int line_cnt = 0; int line_cnt = 0;
char *line = ((FlowNode *) node)->annotv[number]; char *line = ((FlowNode *) node)->annotv[number];
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, idx, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, idx, &z_width, &z_height,
tsize(text_size)); tsize(text_size));
for ( s = ((FlowNode *) node)->annotv[number]; *s; s++) for ( s = ((FlowNode *) node)->annotv[number]; *s; s++)
{ {
...@@ -549,7 +550,7 @@ void FlowAnnot::measure_annot( char *text, double *width, double *height) ...@@ -549,7 +550,7 @@ void FlowAnnot::measure_annot( char *text, double *width, double *height)
char *line = text; char *line = text;
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, text_size, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, text_size, &z_width, &z_height,
tsize(text_size)); tsize(text_size));
z_width = 0; z_width = 0;
...@@ -682,8 +683,7 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type ...@@ -682,8 +683,7 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type
switch ( annot_type) { switch ( annot_type) {
case flow_eAnnotType_OneLine: case flow_eAnnotType_OneLine:
ctx->fdraw->get_text_extent( ctx, text, strlen(text), draw_type, text_size, ctx->fdraw->get_text_extent( ctx, text, strlen(text), draw_type, text_size,
&z_width, &z_height, &z_width, &z_height, (8+2*text_size));
ctx->zoom_factor / ctx->base_zoom_factor * (8+2*text_size));
*rows = 1; *rows = 1;
break; break;
case flow_eAnnotType_MultiLine: case flow_eAnnotType_MultiLine:
...@@ -694,8 +694,8 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type ...@@ -694,8 +694,8 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type
char *line = text; char *line = text;
char *s; char *s;
ctx->fdraw->get_text_extent( ctx, "Ag", 1, draw_type, text_size, &z_width, &z_height, ctx->fdraw->get_text_extent( ctx, "Ag", 2, draw_type, text_size, &z_width, &z_height,
ctx->zoom_factor / ctx->base_zoom_factor * (8+2*text_size)); (8+2*text_size));
z_width = 0; z_width = 0;
for ( s = text; *s; s++) for ( s = text; *s; s++)
...@@ -705,8 +705,7 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type ...@@ -705,8 +705,7 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type
if ( len) if ( len)
{ {
ctx->fdraw->get_text_extent( ctx, line, len, draw_type, text_size, ctx->fdraw->get_text_extent( ctx, line, len, draw_type, text_size,
&l_width, &l_height, &l_width, &l_height, (8+2*text_size));
ctx->zoom_factor / ctx->base_zoom_factor * (8+2*text_size));
z_width = MAX( z_width, l_width); z_width = MAX( z_width, l_width);
} }
len = 0; len = 0;
...@@ -719,8 +718,7 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type ...@@ -719,8 +718,7 @@ void flow_measure_annot_text( FlowCtx *ctx, char *text, flow_eDrawType draw_type
if ( len) if ( len)
{ {
ctx->fdraw->get_text_extent( ctx, line, len, draw_type, text_size, ctx->fdraw->get_text_extent( ctx, line, len, draw_type, text_size,
&l_width, &l_height, &l_width, &l_height, (8+2*text_size));
ctx->zoom_factor / ctx->base_zoom_factor * (8+2*text_size));
z_width = MAX( z_width, l_width); z_width = MAX( z_width, l_width);
line_cnt++; line_cnt++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7