Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
d645e5dd
Commit
d645e5dd
authored
Jun 29, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rulers bug (presentations)
parent
c58732c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
slide/Drawing/HtmlPage.js
slide/Drawing/HtmlPage.js
+5
-0
word/Drawing/HtmlPage.js
word/Drawing/HtmlPage.js
+5
-0
word/Drawing/Rulers.js
word/Drawing/Rulers.js
+3
-3
No files found.
slide/Drawing/HtmlPage.js
View file @
d645e5dd
...
...
@@ -3551,6 +3551,11 @@ function CEditorPage(api)
return
str
;
//console.log(str);
};
this
.
GetMainContentBounds
=
function
()
{
return
this
.
m_oMainParent
.
AbsolutePosition
;
};
}
//------------------------------------------------------------export----------------------------------------------------
...
...
word/Drawing/HtmlPage.js
View file @
d645e5dd
...
...
@@ -3854,6 +3854,11 @@ function CEditorPage(api)
var
dKoef
=
g_dKoef_mm_to_pix
*
this
.
m_nZoomValue
/
100
;
return
5
+
dKoef
*
x
;
};
this
.
GetMainContentBounds
=
function
()
{
return
this
.
m_oMainContent
.
AbsolutePosition
;
};
}
var
_message_update
=
"
zero_delay_update
"
;
...
...
word/Drawing/Rulers.js
View file @
d645e5dd
...
...
@@ -1096,7 +1096,7 @@ function CHorRuler()
var
hor_ruler
=
word_control
.
m_oTopRuler_horRuler
;
var
dKoefPxToMM
=
100
*
g_dKoef_pix_to_mm
/
word_control
.
m_nZoomValue
;
var
_x
=
global_mouseEvent
.
X
-
5
*
g_dKoef_mm_to_pix
-
left
-
word_control
.
X
-
word_control
.
m_oMainContent
.
AbsolutePosition
.
L
*
g_dKoef_mm_to_pix
;
var
_x
=
global_mouseEvent
.
X
-
5
*
g_dKoef_mm_to_pix
-
left
-
word_control
.
X
-
word_control
.
GetMainContentBounds
()
.
L
*
g_dKoef_mm_to_pix
;
_x
*=
dKoefPxToMM
;
var
_y
=
(
global_mouseEvent
.
Y
-
word_control
.
Y
)
*
g_dKoef_pix_to_mm
;
...
...
@@ -1821,7 +1821,7 @@ function CHorRuler()
var
dKoefPxToMM
=
100
*
g_dKoef_pix_to_mm
/
word_control
.
m_nZoomValue
;
var
dKoef_mm_to_pix
=
g_dKoef_mm_to_pix
*
this
.
m_dZoom
;
var
_x
=
global_mouseEvent
.
X
-
5
*
g_dKoef_mm_to_pix
-
left
-
word_control
.
X
-
word_control
.
m_oMainContent
.
AbsolutePosition
.
L
*
g_dKoef_mm_to_pix
;
var
_x
=
global_mouseEvent
.
X
-
5
*
g_dKoef_mm_to_pix
-
left
-
word_control
.
X
-
word_control
.
GetMainContentBounds
()
.
L
*
g_dKoef_mm_to_pix
;
_x
*=
dKoefPxToMM
;
var
_y
=
(
global_mouseEvent
.
Y
-
word_control
.
Y
)
*
g_dKoef_pix_to_mm
;
...
...
@@ -3478,7 +3478,7 @@ function CVerRuler()
var
_y
=
global_mouseEvent
.
Y
-
7
*
g_dKoef_mm_to_pix
-
top
-
word_control
.
Y
;
_y
*=
dKoefPxToMM
;
var
_x
=
(
global_mouseEvent
.
X
-
word_control
.
X
)
*
g_dKoef_pix_to_mm
-
word_control
.
m_oMainContent
.
AbsolutePosition
.
L
;
var
_x
=
(
global_mouseEvent
.
X
-
word_control
.
X
)
*
g_dKoef_pix_to_mm
-
word_control
.
GetMainContentBounds
()
.
L
;
this
.
DragType
=
this
.
CheckMouseType
(
_x
,
_y
);
...
...
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