mirror of https://github.com/anoshenko/rui.git
Bug fixing
This commit is contained in:
parent
3b0ebb3a82
commit
ab1b406278
|
@ -15,6 +15,15 @@ div {
|
|||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
p, h1, h2, h3, h4, h5, h6, blockquote, code {
|
||||
-webkit-user-select: text;
|
||||
-moz-user-select: text;
|
||||
-ms-user-select: text;
|
||||
user-select: text;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
div:focus {
|
||||
outline: none;
|
||||
|
|
2
popup.go
2
popup.go
|
@ -235,7 +235,7 @@ func (popup *popupData) init(view View, params Params) {
|
|||
Style: "ruiPopupLayer",
|
||||
CellVerticalAlign: vAlign,
|
||||
CellHorizontalAlign: hAlign,
|
||||
Content: popupView,
|
||||
Content: NewColumnLayout(session, Params{Content: popupView}),
|
||||
MaxWidth: Percent(100),
|
||||
MaxHeight: Percent(100),
|
||||
})
|
||||
|
|
13
viewUtils.go
13
viewUtils.go
|
@ -70,12 +70,13 @@ func IsDisabled(view View, subviewID string) bool {
|
|||
if subviewID != "" {
|
||||
view = ViewByID(view, subviewID)
|
||||
}
|
||||
|
||||
if disabled, _ := boolProperty(view, Disabled, view.Session()); disabled {
|
||||
return true
|
||||
}
|
||||
if parent := view.Parent(); parent != nil {
|
||||
return IsDisabled(parent, "")
|
||||
if view != nil {
|
||||
if disabled, _ := boolProperty(view, Disabled, view.Session()); disabled {
|
||||
return true
|
||||
}
|
||||
if parent := view.Parent(); parent != nil {
|
||||
return IsDisabled(parent, "")
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue