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

bug 118058 - filepicker comes up empty. r=hewitt, sr=hyatt.

This commit is contained in:
bryner%netscape.com 2002-01-05 01:32:12 +00:00
Родитель 4d33713829
Коммит 589925312c
4 изменённых файлов: 94 добавлений и 72 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

80
layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
Просмотреть файл

@ -385,15 +385,10 @@ nsOutlinerBodyFrame::Destroy(nsIPresContext* aPresContext)
return nsLeafBoxFrame::Destroy(aPresContext);
}
NS_IMETHODIMP nsOutlinerBodyFrame::Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aReflowMetrics,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
void
nsOutlinerBodyFrame::EnsureBoxObject()
{
if (aReflowState.reason == eReflowReason_Initial) {
// We might have a box object with some properties already cached. If so,
// pull them out of the box object and restore them here.
mRowHeight = GetRowHeight();
if (!mOutlinerBoxObject) {
nsCOMPtr<nsIContent> parent;
mContent->GetParent(*getter_AddRefs(parent));
nsCOMPtr<nsIDOMXULElement> parentXUL(do_QueryInterface(parent));
@ -403,32 +398,47 @@ NS_IMETHODIMP nsOutlinerBodyFrame::Reflow(nsIPresContext* aPresContext,
if (box) {
nsCOMPtr<nsIOutlinerBoxObject> outlinerBox(do_QueryInterface(box));
SetBoxObject(outlinerBox);
}
}
}
}
nsAutoString view(NS_LITERAL_STRING("view"));
nsCOMPtr<nsISupports> suppView;
box->GetPropertyAsSupports(view.get(), getter_AddRefs(suppView));
nsCOMPtr<nsIOutlinerView> outlinerView(do_QueryInterface(suppView));
if (outlinerView) {
nsAutoString topRow(NS_LITERAL_STRING("topRow"));
nsXPIDLString rowStr;
box->GetProperty(topRow.get(), getter_Copies(rowStr));
nsAutoString rowStr2(rowStr);
PRInt32 error;
PRInt32 rowIndex = rowStr2.ToInteger(&error);
NS_IMETHODIMP nsOutlinerBodyFrame::Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aReflowMetrics,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
if (aReflowState.reason == eReflowReason_Initial) {
// We might have a box object with some properties already cached. If so,
// pull them out of the box object and restore them here.
mRowHeight = GetRowHeight();
EnsureBoxObject();
nsCOMPtr<nsIBoxObject> box = do_QueryInterface(mOutlinerBoxObject);
if (box) {
nsAutoString view(NS_LITERAL_STRING("view"));
nsCOMPtr<nsISupports> suppView;
box->GetPropertyAsSupports(view.get(), getter_AddRefs(suppView));
nsCOMPtr<nsIOutlinerView> outlinerView(do_QueryInterface(suppView));
// Set our view.
SetView(outlinerView);
// Scroll to the given row.
ScrollToRow(rowIndex);
// Clear out the property info for the top row, but we always keep the
// view current.
box->RemoveProperty(topRow.get());
return nsLeafBoxFrame::Reflow(aPresContext, aReflowMetrics, aReflowState, aStatus);
}
if (outlinerView) {
nsAutoString topRow(NS_LITERAL_STRING("topRow"));
nsXPIDLString rowStr;
box->GetProperty(topRow.get(), getter_Copies(rowStr));
nsAutoString rowStr2(rowStr);
PRInt32 error;
PRInt32 rowIndex = rowStr2.ToInteger(&error);
// Set our view.
SetView(outlinerView);
// Scroll to the given row.
ScrollToRow(rowIndex);
// Clear out the property info for the top row, but we always keep the
// view current.
box->RemoveProperty(topRow.get());
return nsLeafBoxFrame::Reflow(aPresContext, aReflowMetrics, aReflowState, aStatus);
}
}
@ -501,10 +511,8 @@ NS_IMETHODIMP nsOutlinerBodyFrame::GetView(nsIOutlinerView * *aView)
NS_IMETHODIMP nsOutlinerBodyFrame::SetView(nsIOutlinerView * aView)
{
// First clear out the old view.
nsCOMPtr<nsIBoxObject> box(do_QueryInterface(mOutlinerBoxObject));
if (!box)
return NS_OK; // Just ignore the call. An initial reflow when it comes in
// will retrieve the view from the box object.
EnsureBoxObject();
nsCOMPtr<nsIBoxObject> box = do_QueryInterface(mOutlinerBoxObject);
nsAutoString view(NS_LITERAL_STRING("view"));

3
layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h
Просмотреть файл

@ -390,6 +390,9 @@ protected:
// Convert a border style into line style.
nsLineStyle ConvertBorderStyleToLineStyle(PRUint8 aBorderStyle);
// Cache the box object
void EnsureBoxObject();
protected: // Data Members
// Our cached pres context.
nsIPresContext* mPresContext;

80
layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
Просмотреть файл

@ -385,15 +385,10 @@ nsOutlinerBodyFrame::Destroy(nsIPresContext* aPresContext)
return nsLeafBoxFrame::Destroy(aPresContext);
}
NS_IMETHODIMP nsOutlinerBodyFrame::Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aReflowMetrics,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
void
nsOutlinerBodyFrame::EnsureBoxObject()
{
if (aReflowState.reason == eReflowReason_Initial) {
// We might have a box object with some properties already cached. If so,
// pull them out of the box object and restore them here.
mRowHeight = GetRowHeight();
if (!mOutlinerBoxObject) {
nsCOMPtr<nsIContent> parent;
mContent->GetParent(*getter_AddRefs(parent));
nsCOMPtr<nsIDOMXULElement> parentXUL(do_QueryInterface(parent));
@ -403,32 +398,47 @@ NS_IMETHODIMP nsOutlinerBodyFrame::Reflow(nsIPresContext* aPresContext,
if (box) {
nsCOMPtr<nsIOutlinerBoxObject> outlinerBox(do_QueryInterface(box));
SetBoxObject(outlinerBox);
}
}
}
}
nsAutoString view(NS_LITERAL_STRING("view"));
nsCOMPtr<nsISupports> suppView;
box->GetPropertyAsSupports(view.get(), getter_AddRefs(suppView));
nsCOMPtr<nsIOutlinerView> outlinerView(do_QueryInterface(suppView));
if (outlinerView) {
nsAutoString topRow(NS_LITERAL_STRING("topRow"));
nsXPIDLString rowStr;
box->GetProperty(topRow.get(), getter_Copies(rowStr));
nsAutoString rowStr2(rowStr);
PRInt32 error;
PRInt32 rowIndex = rowStr2.ToInteger(&error);
NS_IMETHODIMP nsOutlinerBodyFrame::Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aReflowMetrics,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
if (aReflowState.reason == eReflowReason_Initial) {
// We might have a box object with some properties already cached. If so,
// pull them out of the box object and restore them here.
mRowHeight = GetRowHeight();
EnsureBoxObject();
nsCOMPtr<nsIBoxObject> box = do_QueryInterface(mOutlinerBoxObject);
if (box) {
nsAutoString view(NS_LITERAL_STRING("view"));
nsCOMPtr<nsISupports> suppView;
box->GetPropertyAsSupports(view.get(), getter_AddRefs(suppView));
nsCOMPtr<nsIOutlinerView> outlinerView(do_QueryInterface(suppView));
// Set our view.
SetView(outlinerView);
// Scroll to the given row.
ScrollToRow(rowIndex);
// Clear out the property info for the top row, but we always keep the
// view current.
box->RemoveProperty(topRow.get());
return nsLeafBoxFrame::Reflow(aPresContext, aReflowMetrics, aReflowState, aStatus);
}
if (outlinerView) {
nsAutoString topRow(NS_LITERAL_STRING("topRow"));
nsXPIDLString rowStr;
box->GetProperty(topRow.get(), getter_Copies(rowStr));
nsAutoString rowStr2(rowStr);
PRInt32 error;
PRInt32 rowIndex = rowStr2.ToInteger(&error);
// Set our view.
SetView(outlinerView);
// Scroll to the given row.
ScrollToRow(rowIndex);
// Clear out the property info for the top row, but we always keep the
// view current.
box->RemoveProperty(topRow.get());
return nsLeafBoxFrame::Reflow(aPresContext, aReflowMetrics, aReflowState, aStatus);
}
}
@ -501,10 +511,8 @@ NS_IMETHODIMP nsOutlinerBodyFrame::GetView(nsIOutlinerView * *aView)
NS_IMETHODIMP nsOutlinerBodyFrame::SetView(nsIOutlinerView * aView)
{
// First clear out the old view.
nsCOMPtr<nsIBoxObject> box(do_QueryInterface(mOutlinerBoxObject));
if (!box)
return NS_OK; // Just ignore the call. An initial reflow when it comes in
// will retrieve the view from the box object.
EnsureBoxObject();
nsCOMPtr<nsIBoxObject> box = do_QueryInterface(mOutlinerBoxObject);
nsAutoString view(NS_LITERAL_STRING("view"));

3
layout/xul/base/src/tree/src/nsTreeBodyFrame.h
Просмотреть файл

@ -390,6 +390,9 @@ protected:
// Convert a border style into line style.
nsLineStyle ConvertBorderStyleToLineStyle(PRUint8 aBorderStyle);
// Cache the box object
void EnsureBoxObject();
protected: // Data Members
// Our cached pres context.
nsIPresContext* mPresContext;