Bug 261054. Make caret consistently the same width throughout Gecko/Mozilla. Configurable through ui.caretWidth. r=glazou, sr=rbs

git-svn-id: svn://10.0.0.236/trunk@163639 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
aaronleventhal%moonset.net
2004-10-13 01:12:14 +00:00
parent 951a2bbbb2
commit 2ed5e7dde3
26 changed files with 53 additions and 202 deletions

View File

@@ -335,12 +335,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = 500;
break;
case eMetric_SingleLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_MultiLineCaretWidth:
aMetric = 2;
break;
case eMetric_ShowCaretDuringSelection:
aMetric = 1;
break;

View File

@@ -343,8 +343,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = 500;
break;
case eMetric_SingleLineCaretWidth:
case eMetric_MultiLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_ShowCaretDuringSelection:

View File

@@ -348,8 +348,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = 500;
break;
case eMetric_SingleLineCaretWidth:
case eMetric_MultiLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_ShowCaretDuringSelection:

View File

@@ -478,8 +478,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = ::GetCaretTime() * 1000 / 60;
break;
case eMetric_SingleLineCaretWidth:
case eMetric_MultiLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_ShowCaretDuringSelection:

View File

@@ -276,12 +276,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = WinQuerySysValue( HWND_DESKTOP, SV_CURSORRATE);
break;
case eMetric_SingleLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_MultiLineCaretWidth:
aMetric = 2;
break;
case eMetric_ShowCaretDuringSelection:
aMetric = 0;
break;

View File

@@ -300,9 +300,8 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = 500;
break;
case eMetric_SingleLineCaretWidth:
case eMetric_MultiLineCaretWidth:
aMetric = 2;
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_ShowCaretDuringSelection:
aMetric = 0;

View File

@@ -271,12 +271,9 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = (PRInt32)::GetCaretBlinkTime();
break;
case eMetric_SingleLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_MultiLineCaretWidth:
aMetric = 2;
break;
case eMetric_ShowCaretDuringSelection:
aMetric = 0;
break;

View File

@@ -275,8 +275,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
case eMetric_CaretBlinkTime:
aMetric = 500;
break;
case eMetric_SingleLineCaretWidth:
case eMetric_MultiLineCaretWidth:
case eMetric_CaretWidth:
aMetric = 1;
break;
case eMetric_ShowCaretDuringSelection:

View File

@@ -83,7 +83,7 @@ nsLookAndFeelIntPref nsXPLookAndFeel::sIntPrefs[] =
{ "ui.listVerticalInsidePadding", eMetric_ListVerticalInsidePadding,
PR_FALSE, nsLookAndFeelTypeInt, 0 },
{ "ui.caretBlinkTime", eMetric_CaretBlinkTime, PR_FALSE, nsLookAndFeelTypeInt, 0 },
{ "ui.caretWidthTwips", eMetric_SingleLineCaretWidth, PR_FALSE, nsLookAndFeelTypeInt, 0 },
{ "ui.caretWidth", eMetric_CaretWidth, PR_FALSE, nsLookAndFeelTypeInt, 0 },
{ "ui.caretVisibleWithSelection", eMetric_ShowCaretDuringSelection, PR_FALSE, nsLookAndFeelTypeInt, 0 },
{ "ui.submenuDelay", eMetric_SubmenuDelay, PR_FALSE, nsLookAndFeelTypeInt, 0 },
{ "ui.dragFullWindow", eMetric_DragFullWindow, PR_FALSE, nsLookAndFeelTypeInt, 0 },