# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: z_lezhnin@mail2000.ru-20120328134648-82no09u48yi03dg1 # target_branch: http://bazaar.launchpad.net/~inkscape.dev/inkscape\ # /trunk/ # testament_sha1: 34471d248f410358682ddf97933c0480d9b64f7f # timestamp: 2012-03-28 20:47:04 +0700 # base_revision_id: removethis.john.q.public@bigmail.com-\ # 20120316041522-q597ylywnxn86wdc # # Begin patch === modified file 'src/ui/dialog/text-edit.cpp' --- src/ui/dialog/text-edit.cpp 2012-03-12 13:25:05 +0000 +++ src/ui/dialog/text-edit.cpp 2012-03-28 13:46:48 +0000 @@ -502,7 +502,22 @@ #else const gchar *sstr = gtk_entry_get_text ((GtkEntry *) (gtk_bin_get_child (GTK_BIN (spacing_combo)))); #endif - sp_repr_css_set_property (css, "line-height", sstr); + + //change text for right entering of the real numbers + if (!memchr(sstr,'%',strlen(sstr))) //if there is no percent symbol + { + float percent; //get real percent + sscanf(sstr,"%f",&percent); + gchar outstr[51]; //print new string + sprintf(outstr,"%d",int(percent*100)); + strcat(outstr,"%"); + gtk_entry_set_text ((GtkEntry *) gtk_bin_get_child ((GtkBin *) spacing_combo), outstr); + sp_repr_css_set_property (css, "line-height", outstr); + } + else + { + sp_repr_css_set_property (css, "line-height", sstr); + } return css; } # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd4v/rsAAfLfgARQc/f//1KE ACq////6UARu7zXoN7VdtDpVUMkQ1E8KHiaR5TZT1PapmmmUeoAGRo9QaQk9TTNT0aammQAAZAAA ABFT1GelNM1GmmEYmhoYmBDE00aZDBiEVP0mmKAGJoBoGgNNAaA0CSQmgTAFPRoJpHpomhPNFPUB k9T1PUWSZpqRl7T6ROx9769caxkhTy4LfFUE8AArcU5EFWSkEhiTvjPns0ixaLrlj89VBKXqKoqd uh0xxzr3rKt1adE0xHQVttpYLgE4xcpDgPzEL/PEQYCBrhduY2SmxQGBFbsBSHYMFn1YnJ5FaMqK G3Oxqy+wz7c3E1TpKCGhJBpEzNZpkewe4t642isVW4wd7fJTRl4hFXr3U6il98g9AN+VduUTNqM6 uIuxLomCdZGaJEIEc4Mpahyn2HhylkxJ5lHgKRQUIHFz5fdbixDLh2ft/O4tw+ic+xYIRtKEkVUG YoyATYyXeU4SGqKZ845JGJMAfhPKKkh2VBco2JfunMImEbfdz4LR6sn1OenpXWjwvkyAaL2zDWPI vFDGyBkwnq+mmzEmoE9ptjqWU4QWb0SO8oRcwp5xcxSF5twv1FFxXgUzk3tGNKlo2Pw5LG4lMoz1 xetLIWChk151SENC1StUpYrvUbleR37FLmxPWUyrorFdJYKVxgoMJ5YKqrkqTpWqK3XXTlYN/aRp azmx7wagehmC1G1VUwautKVHEMVBm0gwBxiP8l4N3HzGpc8MiklSy7soNDxL+ZECJwnUmIibXZJb 3QH0wncwfCTz6Hj5MeMFsIBu72N+y6nnqVXNV3A2EhwZOYCSNnVGGKVbAQ/i6oXbntrR027s34ct hWbOWinmDddFOxaGu0qZyOW2PfV2339Sj5BjJK9dw804nr89eOA0CGQSHSw61unAe5qEGioG2oRn PZHLqbq5g5E2F1V9g7578MkxjqeAXADqndFlyNiTPPi21QlJ5LDO9zjjEwolgOZuf2XJ6wYu6ssk YaP4QW+woIrUvjUGu6kD4clPR1preZLMe0UNG2zrF4gH9bTxiUBn6EWI6QVAPI0hBPhXUvFlqm6i oGWdfcOeysXzAfxXRYJhRNvHLrTstWCaXtymJZzktaR27lOdNdYEvmFpfqMTN34bp1wjtDVaqusM VzjXkvNWmIaBRw1nEJgZKgKHhCAYumSzXkPw9Nr56OS4qsO5fIO1KxUyEZ6Pfdea5YqOkSKhLEVm KgALHRwXd3MFMFkmAHeWcGjpIFIr1cEHr1T89N7MLZlM78KTilQHhKE52Ay83LGk5ja1GmVP+YSa 2ZPWTz/p3UKaxb8T66tXacxblWUm7AC9roMLRICHgG4VmhFYbJAlDTeoNUVJzAhC+VI9NlnYMnuT m8JdKqVzcXvmBp13/ctGzCl2uDD6ALRQBBTnlk3BybmBne80B2MK4p5MhAVbGuLqupjDa+SBOqM8 7D4PAsCdMBvYHKLLgi94H8CbgcPHqUsIstgubiEsZ6i/oYzTOIuAMIuhYCjoOcFlZBbTaNd0vzKk HoH/i7kinChIbxf/XYA=