wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 401214 - "bring back support for MOUSE_SCROLL_TEXTSIZE (mousewheel.withcontrolkey.action = 3)" [p=dao r+sr=sicking r+aM9=mconnor a=blocking1.9+ for M9]

Browse Source
This commit is contained in:
reed@reedloden.com 2007-10-30 12:13:37 -07:00
parent 1e894e372f
commit c2290258ae
4 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/app/profile/firefox.js
View File

@ -378,7 +378,7 @@ pref("mousewheel.withmetakey.action",0);
pref("mousewheel.withmetakey.sysnumlines",true);
pref("mousewheel.withmetakey.numlines",1);
#endif
pref("mousewheel.withcontrolkey.action",3);
pref("mousewheel.withcontrolkey.action",5);
pref("mousewheel.withcontrolkey.sysnumlines",false);
pref("mousewheel.withcontrolkey.numlines",1);

2
browser/base/content/browser-textZoom.js
View File

@ -44,7 +44,7 @@ const MOUSE_SCROLL_IS_HORIZONTAL = 1 << 2;
// One of the possible values for the mousewheel.* preferences.
// From nsEventStateManager.cpp.
const MOUSE_SCROLL_FULLZOOM = 3;
const MOUSE_SCROLL_FULLZOOM = 5;
/**
* Controls the "full zoom" setting and its site-specific preferences.

61
content/events/src/nsEventStateManager.cpp
View File

@ -215,8 +215,9 @@ enum {
MOUSE_SCROLL_N_LINES,
MOUSE_SCROLL_PAGE,
MOUSE_SCROLL_HISTORY,
MOUSE_SCROLL_FULLZOOM,
MOUSE_SCROLL_PIXELS
MOUSE_SCROLL_TEXTSIZE,
MOUSE_SCROLL_PIXELS,
MOUSE_SCROLL_FULLZOOM
};
struct AccessKeyInfo {
@ -1938,8 +1939,10 @@ nsEventStateManager::GenerateDragGesture(nsPresContext* aPresContext,
} // GenerateDragGesture
nsresult
nsEventStateManager::ChangeFullZoom(PRInt32 change)
nsEventStateManager::GetMarkupDocumentViewer(nsIMarkupDocumentViewer** aMv)
{
*aMv = nsnull;
if(!gLastFocusedDocument) return NS_ERROR_FAILURE;
nsPIDOMWindow* ourWindow = gLastFocusedDocument->GetWindow();
@ -1973,6 +1976,35 @@ nsEventStateManager::ChangeFullZoom(PRInt32 change)
nsCOMPtr<nsIMarkupDocumentViewer> mv(do_QueryInterface(cv));
if(!mv) return NS_ERROR_FAILURE;
*aMv = mv;
NS_IF_ADDREF(*aMv);
return NS_OK;
}
nsresult
nsEventStateManager::ChangeTextSize(PRInt32 change)
{
nsCOMPtr<nsIMarkupDocumentViewer> mv;
nsresult rv = GetMarkupDocumentViewer(getter_AddRefs(mv));
NS_ENSURE_SUCCESS(rv, rv);
float textzoom;
mv->GetTextZoom(&textzoom);
textzoom += ((float)change) / 10;
if (textzoom > 0 && textzoom <= 20)
mv->SetTextZoom(textzoom);
return NS_OK;
}
nsresult
nsEventStateManager::ChangeFullZoom(PRInt32 change)
{
nsCOMPtr<nsIMarkupDocumentViewer> mv;
nsresult rv = GetMarkupDocumentViewer(getter_AddRefs(mv));
NS_ENSURE_SUCCESS(rv, rv);
float fullzoom;
float zoomMin = ((float)nsContentUtils::GetIntPref("fullZoom.minPercent", 50)) / 100;
float zoomMax = ((float)nsContentUtils::GetIntPref("fullZoom.maxPercent", 300)) / 100;
@ -2004,7 +2036,7 @@ nsEventStateManager::DoScrollHistory(PRInt32 direction)
}
void
nsEventStateManager::DoScrollFullZoom(nsIFrame *aTargetFrame,
nsEventStateManager::DoScrollTextsize(nsIFrame *aTargetFrame,
PRInt32 adjustment)
{
// Exclude form controls and XUL content.
@ -2014,6 +2046,21 @@ nsEventStateManager::DoScrollFullZoom(nsIFrame *aTargetFrame,
!content->IsNodeOfType(nsINode::eXUL))
{
// negative adjustment to increase text size, positive to decrease
ChangeTextSize((adjustment > 0) ? -1 : 1);
}
}
void
nsEventStateManager::DoScrollFullZoom(nsIFrame *aTargetFrame,
PRInt32 adjustment)
{
// Exclude form controls and XUL content.
nsIContent *content = aTargetFrame->GetContent();
if (content &&
!content->IsNodeOfType(nsINode::eHTML_FORM_CONTROL) &&
!content->IsNodeOfType(nsINode::eXUL))
{
// negative adjustment to increase zoom, positive to decrease
ChangeFullZoom((adjustment > 0) ? -1 : 1);
}
}
@ -2395,6 +2442,12 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
}
break;
case MOUSE_SCROLL_TEXTSIZE:
{
DoScrollTextsize(aTargetFrame, msEvent->delta);
}
break;
case MOUSE_SCROLL_FULLZOOM:
{
DoScrollFullZoom(aTargetFrame, msEvent->delta);

4
content/events/src/nsEventStateManager.h
View File

@ -51,6 +51,7 @@
#include "nsCOMArray.h"
#include "nsIFrame.h"
#include "nsCycleCollectionParticipant.h"
#include "nsIMarkupDocumentViewer.h"
class nsIScrollableView;
class nsIPresShell;
@ -303,7 +304,10 @@ protected:
ScrollQuantity aScrollQuantity);
void ForceViewUpdate(nsIView* aView);
void DoScrollHistory(PRInt32 direction);
void DoScrollTextsize(nsIFrame *aTargetFrame, PRInt32 adjustment);
void DoScrollFullZoom(nsIFrame *aTargetFrame, PRInt32 adjustment);
nsresult GetMarkupDocumentViewer(nsIMarkupDocumentViewer** aMv);
nsresult ChangeTextSize(PRInt32 change);
nsresult ChangeFullZoom(PRInt32 change);
// end mousewheel functions