Merged revision(s) 51316 #ea7d1b855d from trunk:

debugger: check GetTextMetrics result in TAssemblerDlg.DoEditorOptsChanged. Issue #29429
........

git-svn-id: branches/fixes_1_6@51332 -
This commit is contained in:
maxim 2016-01-18 23:11:29 +00:00
parent aafe5f17a7
commit 922118423c

View File

@ -849,12 +849,13 @@ begin
else
pbAsm.Font.Quality := fqDefault;
GetTextMetrics(pbAsm.Canvas.Handle, TM{%H-});
FCharWidth := TM.tmMaxCharWidth; // EditorOpts.ExtraCharSpacing +
sbHorizontal.SmallChange := FCHarWidth;
FLineHeight := Max(6,EditorOpts.ExtraLineSpacing + TM.tmHeight);
SetLineCount(pbAsm.Height div FLineHeight);
if GetTextMetrics(pbAsm.Canvas.Handle, TM{%H-}) then
begin
FCharWidth := TM.tmMaxCharWidth; // EditorOpts.ExtraCharSpacing +
sbHorizontal.SmallChange := FCharWidth;
FLineHeight := Max(6,EditorOpts.ExtraLineSpacing + TM.tmHeight);
SetLineCount(pbAsm.Height div FLineHeight);
end;
end;
procedure TAssemblerDlg.SetLocation(ADebugger: TDebuggerIntf; const AAddr: TDBGPtr;