Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 52150; show caret in new composer/mail composer/AIM windows. If the editor is focussed on creation, show the caret instead of relying on a focus event. r, sr = kin,saari, hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@80042 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
2000-09-28 00:31:48 +00:00
parent 4b74e084f3
commit a14fff2410
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mozilla/editor/base/nsEditorShell.cpp
View File

@@ -39,6 +39,7 @@
#include "nsIDiskDocument.h"
#include "nsIDocument.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeList.h"
#include "nsICSSLoader.h"
@@ -91,6 +92,8 @@
#include "nsIRefreshURI.h"
#include "nsIPref.h"
#include "nsILookAndFeel.h"
///////////////////////////////////////
// Editor Includes
///////////////////////////////////////
@@ -630,6 +633,43 @@ nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUr
// (this also turns on the caret)
mEditor->SetCaretToDocumentStart();
}
// show the caret, if our window is focussed already
nsCOMPtr<nsIDOMWindowInternal> contentInternal = do_QueryReferent(mContentWindow);
nsCOMPtr<nsPIDOMWindow> privContent(do_QueryInterface(contentInternal));
if (privContent)
{
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
privContent->GetRootCommandDispatcher(getter_AddRefs(commandDispatcher));
if (commandDispatcher)
{
nsCOMPtr<nsIDOMWindowInternal> focussedWindow;
commandDispatcher->GetFocusedWindow(getter_AddRefs(focussedWindow));
if (focussedWindow.get() == contentInternal.get()) // now see if we are focussed
{
nsCOMPtr<nsISelectionController> selCon;
editor->GetSelectionController(getter_AddRefs(selCon));
PRInt32 pixelWidth = 1;
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
nsCOMPtr<nsILookAndFeel> lookNFeel = do_GetService(kLookAndFeelCID);
if (lookNFeel)
lookNFeel->GetMetric(nsILookAndFeel::eMetric_MultiLineCaretWidth, pixelWidth);
selCon->SetCaretWidth(pixelWidth);
selCon->SetCaretEnabled(PR_FALSE);
selCon->SetCaretEnabled(PR_TRUE); // make damn sure it shows; the last SetVisible
// may have happened when we didn't have focus.
selCon->SetDisplaySelection(nsISelectionController::SELECTION_ON);
}
}
}
return NS_OK;
}

40
mozilla/editor/composer/src/nsEditorShell.cpp
View File

@@ -39,6 +39,7 @@
#include "nsIDiskDocument.h"
#include "nsIDocument.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeList.h"
#include "nsICSSLoader.h"
@@ -91,6 +92,8 @@
#include "nsIRefreshURI.h"
#include "nsIPref.h"
#include "nsILookAndFeel.h"
///////////////////////////////////////
// Editor Includes
///////////////////////////////////////
@@ -630,6 +633,43 @@ nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUr
// (this also turns on the caret)
mEditor->SetCaretToDocumentStart();
}
// show the caret, if our window is focussed already
nsCOMPtr<nsIDOMWindowInternal> contentInternal = do_QueryReferent(mContentWindow);
nsCOMPtr<nsPIDOMWindow> privContent(do_QueryInterface(contentInternal));
if (privContent)
{
nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher;
privContent->GetRootCommandDispatcher(getter_AddRefs(commandDispatcher));
if (commandDispatcher)
{
nsCOMPtr<nsIDOMWindowInternal> focussedWindow;
commandDispatcher->GetFocusedWindow(getter_AddRefs(focussedWindow));
if (focussedWindow.get() == contentInternal.get()) // now see if we are focussed
{
nsCOMPtr<nsISelectionController> selCon;
editor->GetSelectionController(getter_AddRefs(selCon));
PRInt32 pixelWidth = 1;
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
nsCOMPtr<nsILookAndFeel> lookNFeel = do_GetService(kLookAndFeelCID);
if (lookNFeel)
lookNFeel->GetMetric(nsILookAndFeel::eMetric_MultiLineCaretWidth, pixelWidth);
selCon->SetCaretWidth(pixelWidth);
selCon->SetCaretEnabled(PR_FALSE);
selCon->SetCaretEnabled(PR_TRUE); // make damn sure it shows; the last SetVisible
// may have happened when we didn't have focus.
selCon->SetDisplaySelection(nsISelectionController::SELECTION_ON);
}
}
}
return NS_OK;
}