From 5ad60e9da984bc2d9f7175b4401268c666b75ba9 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Thu, 27 Jun 2013 12:43:07 +0900 Subject: [PATCH] skin: Set the background color of the shaft Set the background color of the shaft in CustomScrollBar Change-Id: I0e4c14d7bb8eeb24d287d42af73984adab6b4854 Signed-off-by: GiWoong Kim --- .../src/org/tizen/emulator/skin/custom/ColorTag.java | 4 ++-- .../tizen/emulator/skin/custom/CustomProgressBar.java | 2 +- .../org/tizen/emulator/skin/custom/CustomScrollBar.java | 3 +-- .../emulator/skin/custom/CustomScrolledComposite.java | 9 ++++----- .../skin/custom/CustomScrolledCompositeLayout.java | 4 +++- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/ColorTag.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/ColorTag.java index 1e4654ddfd..68927d5e4f 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/ColorTag.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/ColorTag.java @@ -1,5 +1,5 @@ /** - * + * Pair Tag * * Copyright (C) 2013 Samsung Electronics Co., Ltd. All rights reserved. * @@ -10,7 +10,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or ( at your option ) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java index a07c3f8e79..6a994efe1e 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java @@ -10,7 +10,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or ( at your option ) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrollBar.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrollBar.java index 49e2876139..1478f9f672 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrollBar.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrollBar.java @@ -48,8 +48,6 @@ import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.skin.log.SkinLogger; @@ -172,6 +170,7 @@ public class CustomScrollBar { /* shaft */ canvasShaft = new Canvas(composite, SWT.NONE); + canvasShaft.setBackground(parent.getBackground()); dataShaft.widthShaft = width; dataShaft.heightShaft = heightScrollBar - (height * 2); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledComposite.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledComposite.java index 9f2c4ab5d9..870e4b02b5 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledComposite.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledComposite.java @@ -10,7 +10,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or ( at your option ) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -64,8 +64,9 @@ public class CustomScrolledComposite extends Composite { public boolean expandHorizontal = false; public boolean expandVertical = false; - private int value; - + /** + * Constructor + */ public CustomScrolledComposite(Composite parent, int style, Image[] imagesArrowUp, Image[] imagesArrowDown, Image imageThumb, Image imageShaft) { @@ -86,8 +87,6 @@ public class CustomScrolledComposite extends Composite { this.imagesArrowDown = imagesArrowDown; this.imageThumb = imageThumb; this.imageShaft = imageShaft; - - value = 0; } public CustomScrollBar getScrollBar() { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledCompositeLayout.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledCompositeLayout.java index 2b36253b9e..6377a53c28 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledCompositeLayout.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomScrolledCompositeLayout.java @@ -10,7 +10,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or ( at your option ) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -74,6 +74,8 @@ class ScrolledCompositeLayout extends Layout { return; } + logger.info("layouting"); + CustomScrolledComposite sc = (CustomScrolledComposite)composite; if (sc.content == null) { return; -- 2.34.1