summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmedia.h
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-10-27 19:48:59 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-10-27 19:48:59 +0300
commit07e78807a8b3657ee2303dc22187d858cf8be625 (patch)
treef9b3e011ccf3ccaa1e7262fd22b29aa0b0e5bd8c /indra/llplugin/llpluginclassmedia.h
parent3b1e19d23e83f4d24f8697644eeaf33117c22c1c (diff)
MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too small to read
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r--indra/llplugin/llpluginclassmedia.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index fc27b7bea3..3b0739d044 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -68,6 +68,7 @@ public:
int getTextureHeight() const;
int getFullWidth() const { return mFullMediaWidth; };
int getFullHeight() const { return mFullMediaHeight; };
+ F64 getZoomFactor() const { return mZoomFactor; };
// This may return NULL. Callers need to check for and handle this case.
unsigned char* getBitsData();
@@ -83,7 +84,8 @@ public:
void setSize(int width, int height);
void setAutoScale(bool auto_scale);
-
+ void setZoomFactor(F64 zoom_factor) { mZoomFactor = zoom_factor; }
+
void setBackgroundColor(LLColor4 color) { mBackgroundColor = color; };
void setOwner(LLPluginClassMediaOwner *owner) { mOwner = owner; };
@@ -204,7 +206,7 @@ public:
bool pluginSupportsMediaBrowser(void);
void focus(bool focused);
- void set_page_zoom_factor( double factor );
+ void set_page_zoom_factor( F64 factor );
void clear_cache();
void clear_cookies();
void set_cookies(const std::string &cookies);
@@ -367,6 +369,8 @@ protected:
int mTextureHeight;
int mMediaWidth;
int mMediaHeight;
+
+ F64 mZoomFactor;
float mRequestedVolume;