diff options
| -rw-r--r-- | TurtleArt/tablock.py | 12 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 14 |
2 files changed, 16 insertions, 10 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py index f210330..3ffa259 100644 --- a/TurtleArt/tablock.py +++ b/TurtleArt/tablock.py @@ -72,8 +72,8 @@ class Blocks: def set_scale(self, scale): for b in self.list: - for i in range(len(b._font_size)): - b._font_size[i] *= b.scale * scale / self.font_scale_factor + for i in range(len(b.font_size)): + b.font_size[i] *= b.scale * scale / self.font_scale_factor self.font_scale_factor = scale def spr_to_block(self, spr): @@ -559,7 +559,7 @@ class Block: ''' Some labels move as blocks change shape/size ''' if self.name in block_styles['clamp-style'] or \ self.name in block_styles['clamp-style-collapsible']: - y = int((self.docks[0][3] + self.docks[1][3]) / 3) + y = int((self.docks[0][3] + self.docks[1][3]) / 3.3) self.spr.set_label_attributes(int(self.font_size[0] + 0.5), True, 'right', y_pos=y, i=0) elif self.name in block_styles['clamp-style-1arg']: @@ -570,17 +570,17 @@ class Block: y = self.docks[1][3] - int(int(self.font_size[0] * 1.3)) self.spr.set_label_attributes(int(self.font_size[0] + 0.5), True, 'right', y_pos=y, i=0) - y = self.docks[2][3] - int(int(self.font_size[0] * 1.3)) + y = self.docks[2][3] - int(int(self.font_size[0] * 1.4)) self.spr.set_label_attributes(int(self.font_size[1] + 0.5), True, 'right', y_pos=y, i=1) elif self.name in block_styles['clamp-style-else']: y = self.docks[1][3] - int(int(self.font_size[0] * 1.3)) self.spr.set_label_attributes(int(self.font_size[0] + 0.5), True, 'right', y_pos=y, i=0) - y = self.docks[2][3] - int(int(self.font_size[0] * 1.3)) + y = self.docks[2][3] - int(int(self.font_size[0] * 1.4)) self.spr.set_label_attributes(int(self.font_size[1] + 0.5), True, 'right', y_pos=y, i=1) - y = self.docks[3][3] - int(int(self.font_size[0] * 1.3)) + y = self.docks[3][3] - int(int(self.font_size[0] * 1.4)) self.spr.set_label_attributes(int(self.font_size[1] + 0.5), True, 'right', y_pos=y, i=2) diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index e200f59..5ea41dd 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -155,7 +155,8 @@ class TurtleArtWindow(): self.hw = get_hardware() self.lead = 1.0 if self.hw in (XO1, XO15, XO175): - self.scale = 133. / 200 # tweak scale of fonts on XO + self.scale = 1.0 + self.entry_scale = 0.67 if self.hw == XO1: self.color_mode = '565' else: @@ -164,6 +165,7 @@ class TurtleArtWindow(): self.orientation = VERTICAL_PALETTE else: self.scale = 1.0 + self.entry_scale = 1.0 self.color_mode = '888' # TODO: Read visual mode from gtk image self._set_screen_dpi() @@ -285,6 +287,8 @@ class TurtleArtWindow(): def _set_screen_dpi(self): dpi = get_screen_dpi() + if self.hw in (XO1, XO15, XO175): + dpi = 133 # Tweek because of XO display peculiarities font_map_default = pangocairo.cairo_font_map_get_default() font_map_default.set_resolution(dpi) @@ -776,7 +780,8 @@ class TurtleArtWindow(): # Resize text_entry widget if hasattr(self, '_text_entry') and len(blocks) > 0: font_desc = pango.FontDescription('Sans') - font_desc.set_size(int(blocks[0].font_size[0] * pango.SCALE)) + font_desc.set_size( + int(blocks[0].font_size[0] * pango.SCALE * self.entry_scale)) self._text_entry.modify_font(font_desc) def _shift_toolbar_palette(self, n): @@ -2382,7 +2387,8 @@ class TurtleArtWindow(): self._text_entry.set_justification(gtk.JUSTIFY_CENTER) self._text_buffer = self._text_entry.get_buffer() font_desc = pango.FontDescription('Sans') - font_desc.set_size(int(blk.font_size[0] * pango.SCALE)) + font_desc.set_size( + int(blk.font_size[0] * pango.SCALE * self.entry_scale)) self._text_entry.modify_font(font_desc) self.activity.fixed.put(self._text_entry, 0, 0) self._text_entry.show() @@ -2395,7 +2401,7 @@ class TurtleArtWindow(): if not self.running_sugar: by += self.activity.menu_height + 4 # FIXME: padding mx, my = blk.spr.label_left_top() - self._text_entry.set_pixels_above_lines(my * 2) + self._text_entry.set_pixels_above_lines(my) self.activity.fixed.move(self._text_entry, bx + mx, by + my * 2) self.activity.fixed.show() self._focus_out_id = self._text_entry.connect( |