Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
NiranV
Black Dragon Viewer
Commits
2f7b6062
Commit
2f7b6062
authored
Sep 14, 2019
by
AndreyL ProductEngine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backed out changeset: 8e228364f324
parent
548d688a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
32 deletions
+29
-32
autobuild.xml
autobuild.xml
+7
-7
indra/llplugin/llpluginclassmedia.cpp
indra/llplugin/llpluginclassmedia.cpp
+1
-3
indra/llplugin/llpluginclassmedia.h
indra/llplugin/llpluginclassmedia.h
+1
-1
indra/media_plugins/cef/media_plugin_cef.cpp
indra/media_plugins/cef/media_plugin_cef.cpp
+2
-5
indra/newview/llmediactrl.cpp
indra/newview/llmediactrl.cpp
+1
-4
indra/newview/llpanelprimmediacontrols.cpp
indra/newview/llpanelprimmediacontrols.cpp
+8
-8
indra/newview/llviewermedia.cpp
indra/newview/llviewermedia.cpp
+2
-2
indra/newview/llviewermedia.h
indra/newview/llviewermedia.h
+1
-1
indra/newview/llviewermediafocus.cpp
indra/newview/llviewermediafocus.cpp
+6
-1
No files found.
autobuild.xml
View file @
2f7b6062
...
...
@@ -580,9 +580,9 @@
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
c3c10098d8c9c86bd3392c3441591554
</string>
<string>
23aeaf23e7db2484a1850017141860dd
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3
8807/327515
/dullahan-1.1.
2200_74.1.19_gb62bacf_chromium-74.0.3729.157
-darwin64-52
7989
.tar.bz2
</string>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3
4069/283470
/dullahan-1.1.
1320_3.3626.1895.g7001d56
-darwin64-52
5361
.tar.bz2
</string>
</map>
<key>
name
</key>
<string>
darwin64
</string>
...
...
@@ -592,9 +592,9 @@
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
f8a1da6f464b3a19d2e087525ab97855
</string>
<string>
71fa66203326aca918796e874976c080
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3
8808/327521
/dullahan-1.1.
2200_74.1.19_gb62bacf_chromium-74.0.3729.157
-windows-52
7989
.tar.bz2
</string>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3
4070/283477
/dullahan-1.1.
1320_3.3626.1895.g7001d56
-windows-52
5361
.tar.bz2
</string>
</map>
<key>
name
</key>
<string>
windows
</string>
...
...
@@ -604,16 +604,16 @@
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
bd481e6adfe1280fef7d9f840133421e
</string>
<string>
c7162e4805f50a3609f5dc63d0cf2bc0
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3
8809/327525
/dullahan-1.1.
2200_74.1.19_gb62bacf_chromium-74.0.3729.157
-windows64-52
7989
.tar.bz2
</string>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3
4071/283480
/dullahan-1.1.
1320_3.3626.1895.g7001d56
-windows64-52
5361
.tar.bz2
</string>
</map>
<key>
name
</key>
<string>
windows64
</string>
</map>
</map>
<key>
version
</key>
<string>
1.1.
2200_74.1.19_gb62bacf_chromium-74.0.3729.157
</string>
<string>
1.1.
1320_3.3626.1895.g7001d56
</string>
</map>
<key>
elfio
</key>
<map>
...
...
indra/llplugin/llpluginclassmedia.cpp
View file @
2f7b6062
...
...
@@ -664,14 +664,12 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie
return
result
;
}
void
LLPluginClassMedia
::
scrollEvent
(
int
x
,
int
y
,
int
clicks_x
,
int
clicks_y
,
MASK
modifiers
)
void
LLPluginClassMedia
::
scrollEvent
(
int
x
,
int
y
,
MASK
modifiers
)
{
LLPluginMessage
message
(
LLPLUGIN_MESSAGE_CLASS_MEDIA
,
"scroll_event"
);
message
.
setValueS32
(
"x"
,
x
);
message
.
setValueS32
(
"y"
,
y
);
message
.
setValueS32
(
"clicks_x"
,
clicks_x
);
message
.
setValueS32
(
"clicks_y"
,
clicks_y
);
message
.
setValue
(
"modifiers"
,
translateModifiers
(
modifiers
));
sendMessage
(
message
);
...
...
indra/llplugin/llpluginclassmedia.h
View file @
2f7b6062
...
...
@@ -118,7 +118,7 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
bool
keyEvent
(
EKeyEventType
type
,
int
key_code
,
MASK
modifiers
,
LLSD
native_key_data
);
void
scrollEvent
(
int
x
,
int
y
,
int
clicks_x
,
int
clicks_y
,
MASK
modifiers
);
void
scrollEvent
(
int
x
,
int
y
,
MASK
modifiers
);
// enable/disable media plugin debugging messages and info spam
void
enableMediaPluginDebugging
(
bool
enable
);
...
...
indra/media_plugins/cef/media_plugin_cef.cpp
View file @
2f7b6062
...
...
@@ -657,13 +657,10 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
{
S32
x
=
message_in
.
getValueS32
(
"x"
);
S32
y
=
message_in
.
getValueS32
(
"y"
);
S32
delta_x
=
message_in
.
getValueS32
(
"clicks_x"
);
S32
delta_y
=
message_in
.
getValueS32
(
"clicks_y"
);
const
int
scaling_factor
=
40
;
delta_x
*=
-
scaling_factor
;
delta_y
*=
-
scaling_factor
;
y
*=
-
scaling_factor
;
mCEFLib
->
mouseWheel
(
x
,
y
,
delta_x
,
delta_
y
);
mCEFLib
->
mouseWheel
(
x
,
y
);
}
else
if
(
message_name
==
"text_event"
)
{
...
...
indra/newview/llmediactrl.cpp
View file @
2f7b6062
...
...
@@ -202,10 +202,7 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
{
if
(
LLPanel
::
handleScrollWheel
(
x
,
y
,
clicks
))
return
TRUE
;
if
(
mMediaSource
&&
mMediaSource
->
hasMedia
())
{
convertInputCoords
(
x
,
y
);
mMediaSource
->
scrollWheel
(
x
,
y
,
0
,
clicks
,
gKeyboard
->
currentMask
(
TRUE
));
}
mMediaSource
->
getMediaPlugin
()
->
scrollEvent
(
0
,
clicks
,
gKeyboard
->
currentMask
(
TRUE
));
return
TRUE
;
}
...
...
indra/newview/llpanelprimmediacontrols.cpp
View file @
2f7b6062
...
...
@@ -547,17 +547,17 @@ void LLPanelPrimMediaControls::updateShape()
switch
(
mScrollState
)
{
case
SCROLL_UP
:
media_impl
->
scrollWheel
(
0
,
0
,
0
,
-
1
,
MASK_NONE
);
media_impl
->
scrollWheel
(
0
,
-
1
,
MASK_NONE
);
break
;
case
SCROLL_DOWN
:
media_impl
->
scrollWheel
(
0
,
0
,
0
,
1
,
MASK_NONE
);
media_impl
->
scrollWheel
(
0
,
1
,
MASK_NONE
);
break
;
case
SCROLL_LEFT
:
media_impl
->
scrollWheel
(
0
,
0
,
1
,
0
,
MASK_NONE
);
media_impl
->
scrollWheel
(
1
,
0
,
MASK_NONE
);
// media_impl->handleKeyHere(KEY_LEFT, MASK_NONE);
break
;
case
SCROLL_RIGHT
:
media_impl
->
scrollWheel
(
0
,
0
,
-
1
,
0
,
MASK_NONE
);
media_impl
->
scrollWheel
(
-
1
,
0
,
MASK_NONE
);
// media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
break
;
case
SCROLL_NONE
:
...
...
@@ -1134,7 +1134,7 @@ void LLPanelPrimMediaControls::onScrollUp(void* user_data)
if
(
impl
)
{
impl
->
scrollWheel
(
0
,
0
,
0
,
-
1
,
MASK_NONE
);
impl
->
scrollWheel
(
0
,
-
1
,
MASK_NONE
);
}
}
void
LLPanelPrimMediaControls
::
onScrollUpHeld
(
void
*
user_data
)
...
...
@@ -1151,7 +1151,7 @@ void LLPanelPrimMediaControls::onScrollRight(void* user_data)
if
(
impl
)
{
impl
->
scrollWheel
(
0
,
0
,
-
1
,
0
,
MASK_NONE
);
impl
->
scrollWheel
(
-
1
,
0
,
MASK_NONE
);
// impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
}
}
...
...
@@ -1170,7 +1170,7 @@ void LLPanelPrimMediaControls::onScrollLeft(void* user_data)
if
(
impl
)
{
impl
->
scrollWheel
(
0
,
0
,
1
,
0
,
MASK_NONE
);
impl
->
scrollWheel
(
1
,
0
,
MASK_NONE
);
// impl->handleKeyHere(KEY_LEFT, MASK_NONE);
}
}
...
...
@@ -1189,7 +1189,7 @@ void LLPanelPrimMediaControls::onScrollDown(void* user_data)
if
(
impl
)
{
impl
->
scrollWheel
(
0
,
0
,
0
,
1
,
MASK_NONE
);
impl
->
scrollWheel
(
0
,
1
,
MASK_NONE
);
}
}
void
LLPanelPrimMediaControls
::
onScrollDownHeld
(
void
*
user_data
)
...
...
indra/newview/llviewermedia.cpp
View file @
2f7b6062
...
...
@@ -2309,14 +2309,14 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
}
//////////////////////////////////////////////////////////////////////////////////////////
void
LLViewerMediaImpl
::
scrollWheel
(
S32
x
,
S32
y
,
S32
scroll_x
,
S32
scroll_y
,
MASK
mask
)
void
LLViewerMediaImpl
::
scrollWheel
(
S32
x
,
S32
y
,
MASK
mask
)
{
scaleMouse
(
&
x
,
&
y
);
mLastMouseX
=
x
;
mLastMouseY
=
y
;
if
(
mMediaSource
)
{
mMediaSource
->
scrollEvent
(
x
,
y
,
scroll_x
,
scroll_y
,
mask
);
mMediaSource
->
scrollEvent
(
x
,
y
,
mask
);
}
}
...
...
indra/newview/llviewermedia.h
View file @
2f7b6062
...
...
@@ -230,7 +230,7 @@ class LLViewerMediaImpl
void
mouseMove
(
const
LLVector2
&
texture_coords
,
MASK
mask
);
void
mouseDoubleClick
(
const
LLVector2
&
texture_coords
,
MASK
mask
);
void
mouseDoubleClick
(
S32
x
,
S32
y
,
MASK
mask
,
S32
button
=
0
);
void
scrollWheel
(
S32
x
,
S32
y
,
S32
scroll_x
,
S32
scroll_y
,
MASK
mask
);
void
scrollWheel
(
S32
x
,
S32
y
,
MASK
mask
);
void
mouseCapture
();
void
navigateBack
();
...
...
indra/newview/llviewermediafocus.cpp
View file @
2f7b6062
...
...
@@ -377,7 +377,12 @@ BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks)
LLViewerMediaImpl
*
media_impl
=
getFocusedMediaImpl
();
if
(
media_impl
&&
media_impl
->
hasMedia
())
{
media_impl
->
scrollWheel
(
x
,
y
,
0
,
clicks
,
gKeyboard
->
currentMask
(
TRUE
));
// the scrollEvent() API's x and y are not the same as handleScrollWheel's x and y.
// The latter is the position of the mouse at the time of the event
// The former is the 'scroll amount' in x and y, respectively.
// All we have for 'scroll amount' here is 'clicks'.
// We're also not passed the keyboard modifier mask, but we can get that from gKeyboard.
media_impl
->
getMediaPlugin
()
->
scrollEvent
(
0
,
clicks
,
gKeyboard
->
currentMask
(
TRUE
));
retval
=
TRUE
;
}
return
retval
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment