mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

make line-height calculation language-sensitive to avoid overlapping lines

This commit is contained in:
erik%netscape.com 2000-05-17 06:47:56 +00:00
Родитель 5f83c21ac8
Коммит d6cbea9e50
2 изменённых файлов: 20 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
layout/generic/nsHTMLReflowState.cpp
Просмотреть файл

@ -28,6 +28,7 @@
#include "nsIPresContext.h" #include "nsIPresContext.h"
#include "nsIPresShell.h" #include "nsIPresShell.h"
#include "nsLayoutAtoms.h" #include "nsLayoutAtoms.h"
#include "nsIDeviceContext.h"
#include "nsIRenderingContext.h" #include "nsIRenderingContext.h"
#include "nsIFontMetrics.h" #include "nsIFontMetrics.h"
#include "nsBlockFrame.h" #include "nsBlockFrame.h"
@ -2099,6 +2100,8 @@ ComputeLineHeight(nsIRenderingContext* aRenderingContext,
aStyleContext->GetStyleData(eStyleStruct_Text); aStyleContext->GetStyleData(eStyleStruct_Text);
const nsStyleFont* font = (const nsStyleFont*) const nsStyleFont* font = (const nsStyleFont*)
aStyleContext->GetStyleData(eStyleStruct_Font); aStyleContext->GetStyleData(eStyleStruct_Font);
const nsStyleDisplay* display = (const nsStyleDisplay*)
aStyleContext->GetStyleData(eStyleStruct_Display);
nsStyleUnit unit = text->mLineHeight.GetUnit(); nsStyleUnit unit = text->mLineHeight.GetUnit();
if (eStyleUnit_Inherit == unit) { if (eStyleUnit_Inherit == unit) {
@ -2127,9 +2130,14 @@ ComputeLineHeight(nsIRenderingContext* aRenderingContext,
// font's normal line height (em height + leading). // font's normal line height (em height + leading).
nscoord emHeight = -1; nscoord emHeight = -1;
nscoord normalLineHeight = -1; nscoord normalLineHeight = -1;
aRenderingContext->SetFont(font->mFont); nsCOMPtr<nsIDeviceContext> deviceContext;
aRenderingContext->GetDeviceContext(*getter_AddRefs(deviceContext));
nsCOMPtr<nsIAtom> langGroup;
if (display->mLanguage) {
display->mLanguage->GetLanguageGroup(getter_AddRefs(langGroup));
}
nsCOMPtr<nsIFontMetrics> fm; nsCOMPtr<nsIFontMetrics> fm;
aRenderingContext->GetFontMetrics(*getter_AddRefs(fm)); deviceContext->GetMetricsFor(font->mFont, langGroup, *getter_AddRefs(fm));
#ifdef NEW_FONT_HEIGHT_APIS #ifdef NEW_FONT_HEIGHT_APIS
if (fm) { if (fm) {
fm->GetEmHeight(emHeight); fm->GetEmHeight(emHeight);

12
layout/html/base/src/nsHTMLReflowState.cpp
Просмотреть файл

@ -28,6 +28,7 @@
#include "nsIPresContext.h" #include "nsIPresContext.h"
#include "nsIPresShell.h" #include "nsIPresShell.h"
#include "nsLayoutAtoms.h" #include "nsLayoutAtoms.h"
#include "nsIDeviceContext.h"
#include "nsIRenderingContext.h" #include "nsIRenderingContext.h"
#include "nsIFontMetrics.h" #include "nsIFontMetrics.h"
#include "nsBlockFrame.h" #include "nsBlockFrame.h"
@ -2099,6 +2100,8 @@ ComputeLineHeight(nsIRenderingContext* aRenderingContext,
aStyleContext->GetStyleData(eStyleStruct_Text); aStyleContext->GetStyleData(eStyleStruct_Text);
const nsStyleFont* font = (const nsStyleFont*) const nsStyleFont* font = (const nsStyleFont*)
aStyleContext->GetStyleData(eStyleStruct_Font); aStyleContext->GetStyleData(eStyleStruct_Font);
const nsStyleDisplay* display = (const nsStyleDisplay*)
aStyleContext->GetStyleData(eStyleStruct_Display);
nsStyleUnit unit = text->mLineHeight.GetUnit(); nsStyleUnit unit = text->mLineHeight.GetUnit();
if (eStyleUnit_Inherit == unit) { if (eStyleUnit_Inherit == unit) {
@ -2127,9 +2130,14 @@ ComputeLineHeight(nsIRenderingContext* aRenderingContext,
// font's normal line height (em height + leading). // font's normal line height (em height + leading).
nscoord emHeight = -1; nscoord emHeight = -1;
nscoord normalLineHeight = -1; nscoord normalLineHeight = -1;
aRenderingContext->SetFont(font->mFont); nsCOMPtr<nsIDeviceContext> deviceContext;
aRenderingContext->GetDeviceContext(*getter_AddRefs(deviceContext));
nsCOMPtr<nsIAtom> langGroup;
if (display->mLanguage) {
display->mLanguage->GetLanguageGroup(getter_AddRefs(langGroup));
}
nsCOMPtr<nsIFontMetrics> fm; nsCOMPtr<nsIFontMetrics> fm;
aRenderingContext->GetFontMetrics(*getter_AddRefs(fm)); deviceContext->GetMetricsFor(font->mFont, langGroup, *getter_AddRefs(fm));
#ifdef NEW_FONT_HEIGHT_APIS #ifdef NEW_FONT_HEIGHT_APIS
if (fm) { if (fm) {
fm->GetEmHeight(emHeight); fm->GetEmHeight(emHeight);