test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-11-30 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix layout performance for required indicators in GridLayout #PL-2460

Browse Source
This commit is contained in:
Yuriy Artamonov 2013-09-04 16:25:46 +00:00
parent 718ac86845
commit 167ed13747
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -60,7 +60,7 @@ def desktopModule = project(':cuba-desktop')
def portalModule = project(':cuba-portal')
def webAuthModule = project(':cuba-web-auth')
def vaadinVersion = '7.1.3.h.M4'
def vaadinVersion = '7.1.3.h.M5'
def servletApi = [group: 'org.apache.tomcat', name: 'servlet-api', version: '6.0.20']
def groovyArtifact = [group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.1.6']

11
modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/gridlayout/CubaGridLayoutComponentSlot.java
View File

@ -43,12 +43,17 @@ public class CubaGridLayoutComponentSlot extends ComponentConnectorLayoutSlot im
@Override
public void setCaption(VCaption caption) {
if (rightCaption != null) {
getLayoutManager().unregisterDependency(getLayout(), rightCaption);
rightCaption.removeFromParent();
rightCaption = null;
}
super.setCaption(caption);
if (caption instanceof CubaCaptionWidget) {
if (isCaptionInline()) {
moveIndicatorsRight((CubaCaptionWidget) caption);
}
moveIndicatorsRight((CubaCaptionWidget) caption);
((CubaCaptionWidget) caption).setCaptionHolder(this);
}
}

3
modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/orderedactionslayout/CubaOrderedActionsLayoutWidget.java
View File

@ -57,6 +57,7 @@ public class CubaOrderedActionsLayoutWidget extends VAbstractOrderedLayout {
this.shortcutHandler = shortcutHandler;
}
@Override
public Slot getSlot(Widget widget) {
Slot slot = widgetToSlot.get(widget);
if (slot == null) {
@ -65,4 +66,4 @@ public class CubaOrderedActionsLayoutWidget extends VAbstractOrderedLayout {
}
return slot;
}
}
}