WebSVN – tpanel – Diff – /trunk/tbutton.cpp

         MSG_DEBUG("Drawing system button " << ch << " with instance " << inst);
         return drawButton(inst);
+    }
     else
+    {
-        mActInstance = inst;
+//        mActInstance = inst;
         return drawButton(inst);
+    }
     return false;
+}
     DECL_TRACER("TButton::setText(const string& txt, int instance)");
     if (instance >= 0 && (size_t)instance >= sr.size())
+    {
         MSG_ERROR("Instance " << instance << " does not exist!");
+#if TESTMODE == 1
+        setAllDone();
+#endif
         return false;
+    }
     if (!setTextOnly(txt, instance))
+    {
+#if TESTMODE == 1
+        setAllDone();
+#endif
         return false;
+    }
     if (!mChanged)      // Do not try to redraw the button if nothing changed
+    {
 #if TESTMODE == 1
+        MSG_INFO("Nothing changed!");
         __success = true;
-        __done = true;
+        setScreenDone();
 #endif
         return true;
+    }
     return makeElement(instance);
             sr[i].te = txt;
+        }
+    }
     else
+    {
+        if (sr[instance].te != txt && (int)instance == mActInstance)
+            mChanged = true;
         sr[instance].te = txt;
+    }
     if (instance <= 0 && isSystemButton())
+    {
         bool temp = TConfig::setTemporary(true);
         // If we've an input line or the text line of a "combobox" then we'll
         if (instance < 0)
+        {
             bs.clear();
             for (size_t i = 0; i < sr.size(); ++i)
+            {
+                if (!sr[i].bs.empty())
+                    mChanged = true;
                 sr[i].bs.clear();
+            }
+            if (!bs.empty())
+                mChanged = true;
+            bs.clear();
+        }
         else
+        {
+            if (!sr[instance].bs.empty())
+                mChanged = true;
             sr[instance].bs.clear();
             bs.clear();
+        }
-        mChanged = true;
         if (mEnabled && !hd)
             makeElement(instance);
         return true;
+    }
     if (st.empty())
+    {
         MSG_WARNING("The index " << style << " is not supported!");
 #if TESTMODE == 1
-        __done = true;
+        setAllDone();
 #endif
         return false;
+    }
     // Look in the system table and try to find the border.
 bool TButton::setFontFileName(const string& name, int /*size*/, int instance)
+{
     DECL_TRACER("TButton::setFontFileName(const string& name, int size)");
     if (name.empty() || !mFonts)
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     if ((size_t)instance >= sr.size())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     int id = mFonts->getFontIDfromFile(name);
     if (id == -1)
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
-    int inst = instance;
+    if (instance < 0)
+    {
+        for (size_t i = 0; i < sr.size(); ++i)
-    int loop = 1;
+        {
+            if (sr[i].fi != id)
+                mChanged = true;
+            sr[i].fi = id;
-    if (inst < 0)
+        }
+    }
+    else if (sr[instance].fi != id)
+    {
-        loop = (int)sr.size();
+        mChanged = true;
-        inst = 0;
+        sr[instance].fi = id;
+    }
+#if TESTMODE == 1
+    setScreenDone();
+#endif
+    return true;
+}
+bool TButton::setFontName(const string &name, int instance)
+{
+    DECL_TRACER("TButton::setFontName(const string &name, int instance)");
-    for (int i = 0; i < loop; ++i)
+    if (name.empty() || !mFonts)
+    {
+#if TESTMODE == 1
-        if (sr[inst].fi != id)
+        setScreenDone();
+#endif
-            mChanged = true;
+        return false;
+    }
+    if ((size_t)instance >= sr.size())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
-        sr[inst].fi = id;
+        return false;
+    }
+    int id = mFonts->getFontIDfromName(name);
+    if (id == -1)
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
-        inst++;
+        return false;
+    }
+    if (instance < 0)
+    {
+        for (size_t i = 0; i < sr.size(); ++i)
+        {
+            if (sr[i].fi != id)
+                mChanged = true;
+            sr[i].fi = id;
+        }
+    }
+    else if (sr[instance].fi != id)
+    {
+        mChanged = true;
+        sr[instance].fi = id;
+    }
+#if TESTMODE == 1
+    setScreenDone();
+#endif
     return true;
+}
 bool TButton::setBitmap(const string& file, int instance)
+{
     if (top >= 0 && bottom > top)
         ht = height;
+}
+void TButton::getRectangle(int *left, int *top, int *height, int *width)
+{
+    DECL_TRACER("TButton::getRectangle(int *left, int *top, int *height, int *width)");
+    if (left)
+        *left = lt;
+    if (top)
+        *top = tp;
+    if (height)
+        *height = ht;
+    if (width)
+        *width = wt;
+}
 void TButton::setResourceName(const string& name, int instance)
+{
     DECL_TRACER("TButton::setResourceName(const string& name, int instance)");
     if (instance >= (int)sr.size())
         MSG_ERROR("Invalid instance " << (instance + 1));
         return -1;
+    }
     if (x)
-        *x = sr[instance].bx;
+        *x = sr[instance].jb == 0 ? sr[instance].bx : 0;
     if (y)
-        *y = sr[instance].by;
+        *y = sr[instance].jb == 0 ? sr[instance].by : 0;
     return sr[instance].jb;
+}
 void TButton::setBitmapJustification(int j, int x, int y, int instance)
+{
     DECL_TRACER("TButton::setBitmapJustification(int j, int instance)");
     if (j < 0 || j > 9 || instance >= (int)sr.size())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return;
+    }
     if (instance < 0)
+    {
         for (size_t i = 0; i < sr.size(); i++)
+        {
         MSG_ERROR("Invalid instance " << (instance + 1));
         return -1;
+    }
     if (x)
-        *x = sr[instance].ix;
+        *x = sr[instance].ji == 0 ? sr[instance].ix : 0;
     if (y)
-        *y = sr[instance].iy;
+        *y = sr[instance].ji == 0 ? sr[instance].iy : 0;
     return sr[instance].ji;
+}
 void TButton::setIconJustification(int j, int x, int y, int instance)
+{
     DECL_TRACER("TButton::setIconJustification(int j, int x, int y, int instance)");
     if (j < 0 || j > 9 || instance >= (int)sr.size())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return;
+    }
     if (instance < 0)
+    {
         for (size_t i = 0; i < sr.size(); i++)
+        {
         MSG_ERROR("Invalid instance " << (instance + 1));
         return -1;
+    }
     if (x)
-        *x = sr[instance].tx;
+        *x = sr[instance].jt == 0 ? sr[instance].tx : 0;
     if (y)
-        *y = sr[instance].ty;
+        *y = sr[instance].jt == 0 ? sr[instance].ty : 0;
     return sr[instance].jt;
+}
 void TButton::setTextJustification(int j, int x, int y, int instance)
+{
     DECL_TRACER("TButton::setTextJustification(int j, int x, int y, int instance)");
     if (!setTextJustificationOnly(j, x, y, instance))
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return;
+    }
     makeElement();
+}
 bool TButton::setTextJustificationOnly(int j, int x, int y, int instance)
     if ((size_t)instance >= sr.size() || instance < 0)
+    {
         MSG_ERROR("Instance " << instance << " is out of bounds!");
         TError::setError();
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     if (!_displayButton && gPageManager)
         _displayButton = gPageManager->getCallbackDB();
     if (!visible || hd || instance != mActInstance || !_displayButton)
+    {
         bool db = (_displayButton != nullptr);
         MSG_DEBUG("Button " << bi << ", \"" << na << "\" at instance " << instance << " is not to draw!");
         MSG_DEBUG("Visible: " << (visible ? "YES" : "NO") << ", Hidden: " << (hd ? "YES" : "NO") << ", Instance/actual instance: " << instance << "/" << mActInstance << ", callback: " << (db ? "PRESENT" : "N/A"));
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return true;
+    }
     MSG_DEBUG("Drawing button " << bi << ", \"" << na << "\" at instance " << instance);
     ulong parent = mHandle & 0xffff0000;
     getDrawOrder(sr[instance]._do, (DRAW_ORDER *)&mDOrder);
     if (TError::isError())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     SkBitmap imgButton;
     if (!allocPixels(wt, ht, &imgButton))
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     // We create an empty (transparent) image here. Later it depends on the
     // draw order of the elements. If, for example, the back ground fill is
     // not the first thing, we must be sure to not destroy already drawn
     // elemts of the button.
     for (int i = 0; i < ORD_ELEM_COUNT; i++)
+    {
         if (mDOrder[i] == ORD_ELEM_FILL)
+        {
             if (!buttonFill(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_BITMAP)
+        {
             if (!sr[instance].dynamic && !buttonBitmap(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
             else if (sr[instance].dynamic && !buttonDynamic(&imgButton, instance, show, &dynState))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_ICON)
+        {
             if (!buttonIcon(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_TEXT)
+        {
             if (!buttonText(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_BORDER)
+        {
             if (!buttonBorder(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
+    }
     if (mGlobalOO >= 0 || sr[instance].oo >= 0) // Take overall opacity into consideration
+    {
         SkBitmap ooButton;
         int w = imgButton.width();
         int h = imgButton.height();
         if (!allocPixels(w, h, &ooButton))
+        {
+#if TESTMODE == 1
+            setScreenDone();
+#endif
             return false;
+        }
         SkCanvas canvas(ooButton);
         SkIRect irect = SkIRect::MakeXYWH(0, 0, w, h);
         SkRegion region;
         region.setRect(irect);
 bool TButton::drawTextArea(int instance)
+{
     DECL_TRACER("TButton::drawTextArea(int instance)");
     if (prg_stopped)
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     if (!visible || hd)
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return true;
+    }
     if ((size_t)instance >= sr.size() || instance < 0)
+    {
         MSG_ERROR("Instance " << instance << " is out of bounds!");
         TError::setError();
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     if (!mChanged)
+    {
+    }
     getDrawOrder(sr[instance]._do, (DRAW_ORDER *)&mDOrder);
     if (TError::isError())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     SkBitmap imgButton;
     if (!allocPixels(wt, ht, &imgButton))
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     for (int i = 0; i < ORD_ELEM_COUNT; i++)
+    {
         if (mDOrder[i] == ORD_ELEM_FILL)
+        {
             if (!buttonFill(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_BITMAP)
+        {
             if (!sr[instance].dynamic && !buttonBitmap(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
             else if (sr[instance].dynamic && !buttonDynamic(&imgButton, instance, false))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_ICON)
+        {
             if (!buttonIcon(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_BORDER)
+        {
             if (!buttonBorder(&imgButton, instance))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 return false;
+            }
+        }
+    }
     if (mGlobalOO >= 0 || sr[instance].oo >= 0) // Take overall opacity into consideration
+    {
         SkBitmap ooButton;
         int w = imgButton.width();
         int h = imgButton.height();
         if (!allocPixels(w, h, &ooButton))
+        {
+#if TESTMODE == 1
+            setScreenDone();
+#endif
             return false;
+        }
         SkCanvas canvas(ooButton);
         SkIRect irect = SkIRect::MakeXYWH(0, 0, w, h);
         SkRegion region;
         region.setRect(irect);
     mutex_button.lock();
     DECL_TRACER("TButton::drawMultistateBargraph(int level, bool show)");
     if (prg_stopped)
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         mutex_button.unlock();
         return false;
+    }
     if (!_displayButton && gPageManager)
     if (!visible || hd || !_displayButton)
+    {
         bool db = (_displayButton != nullptr);
         MSG_DEBUG("Multistate bargraph " << bi << ", \"" << na << " is not to draw!");
         MSG_DEBUG("Visible: " << (visible ? "YES" : "NO") << ", callback: " << (db ? "PRESENT" : "N/A"));
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         mutex_button.unlock();
         return true;
+    }
     int maxLevel = level;
     ulong parent = mHandle & 0xffff0000;
     getDrawOrder(sr[maxLevel]._do, (DRAW_ORDER *)&mDOrder);
     if (TError::isError())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         mutex_button.unlock();
         return false;
+    }
     SkBitmap imgButton;
     if (!allocPixels(wt, ht, &imgButton))
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return false;
+    }
     for (int i = 0; i < ORD_ELEM_COUNT; i++)
+    {
         if (mDOrder[i] == ORD_ELEM_FILL)
+        {
             if (!buttonFill(&imgButton, maxLevel))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 mutex_button.unlock();
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_BITMAP)
+        {
             if (!buttonBitmap(&imgButton, maxLevel))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 mutex_button.unlock();
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_ICON)
+        {
             if (!buttonIcon(&imgButton, maxLevel))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 mutex_button.unlock();
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_TEXT)
+        {
             if (!buttonText(&imgButton, maxLevel))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 mutex_button.unlock();
                 return false;
+            }
+        }
         else if (mDOrder[i] == ORD_ELEM_BORDER)
+        {
             if (!buttonBorder(&imgButton, maxLevel))
+            {
+#if TESTMODE == 1
+                setScreenDone();
+#endif
                 mutex_button.unlock();
                 return false;
+            }
+        }
+    }
         SkBitmap ooButton;
         int w = imgButton.width();
         int h = imgButton.height();
         if (!allocPixels(w, h, &ooButton))
+        {
+#if TESTMODE == 1
+            setScreenDone();
+#endif
             return false;
+        }
         SkCanvas canvas(ooButton);
         SkIRect irect = SkIRect::MakeXYWH(0, 0, w, h);
         SkRegion region;
         region.setRect(irect);
         if (show)
+        {
             TBitmap image((unsigned char *)imgButton.getPixels(), imgButton.info().width(), imgButton.info().height());
             _displayButton(mHandle, parent, image, rwidth, rheight, rleft, rtop, isPassThrough());
+        }
+#if TESTMODE == 1
+        else
+            setScreenDone();
+#endif
+    }
     mutex_button.unlock();
     return true;
+}
 void TButton::show()
+{
     DECL_TRACER("TButton::show()");
+    if (visible && !mChanged)
+        return;
     visible = true;
     makeElement();
     if (isSystemButton() && !mSystemReg)
         registerSystemButton();
 void TButton::showLastButton()
+{
     DECL_TRACER("TButton::showLastButton()");
     if (mLastImage.empty())
+    {
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return;
+    }
     if (!_displayButton && gPageManager)
         _displayButton = gPageManager->getCallbackDB();
     if (!prg_stopped && visible)

Subversion Repositories tpanel

(root)/trunk/tbutton.cpp @ 334 – Rev 333 → 334