Permalink
Browse files

Merge branch 't3040' into next. Incubates #3040

  • Loading branch information...
michaelDCurran committed Mar 31, 2015
2 parents c409fd1 + 1ac99db commit 2e2b33d2b034b835ff9f721bc63f316caec95f52
Showing with 9 additions and 3 deletions.
  1. +3 −3 source/NVDAObjects/window/excel.py
  2. +6 −0 source/controlTypes.py
@@ -829,9 +829,9 @@ def _get_states(self):
states.add(controlTypes.STATE_HASCOMMENT)
if self._overlapInfo is not None:
if self._overlapInfo['obscuredFromRightBy'] > 0:
states.add(controlTypes.STATE_OBSCURED)
states.add(controlTypes.STATE_CROPPED)
if self._overlapInfo['obscuringRightBy'] > 0:
states.add(controlTypes.STATE_OBSCURING)
states.add(controlTypes.STATE_OVERFLOWING)
return states
def getCellWidthAndTextWidth(self):
@@ -847,7 +847,7 @@ def getCellWidthAndTextWidth(self):
deviceCaps = ctypes.windll.gdi32.GetDeviceCaps(tempDC, 88)
#Fetching Font Size and Weight information
iFontSize = self.excelCellObject.Font.Size
iFontSize = int(iFontSize)
iFontSize = 11 if iFontSize is None else int(iFontSize)
iFontSize = ctypes.c_int(iFontSize)
iFontSize = ctypes.windll.kernel32.MulDiv(iFontSize, deviceCaps, 72)
#Font Weight for Bold FOnt is 700 and for normal font it's 400
View
@@ -188,6 +188,8 @@
STATE_HASCOMMENT=0X2000000000
STATE_OBSCURED=0x4000000000
STATE_OBSCURING=0x8000000000
STATE_CROPPED=0x10000000000
STATE_OVERFLOWING=0X20000000000
roleLabels={
# Translators: The word for an unknown control type.
@@ -552,6 +554,10 @@
STATE_OBSCURED:_("obscured"),
# Translators: a state that denotes that the object is overlapping onto adjacent object(s)
STATE_OBSCURING:_("obscuring"),
# Translators: a state that denotes that the object(text) is cropped as it couldn't be accommodated in the allocated/available space
STATE_CROPPED:_("cropped"),
# Translators: a state that denotes that the object(text) is overflowing into the adjacent space
STATE_OVERFLOWING:_("overflowing"),
}
negativeStateLabels={

0 comments on commit 2e2b33d

Please sign in to comment.