Fixed FLineEdit label not shown again after hide() + show()

gansm · gansm · commit de578fe870a3 · 2025-02-15T20:18:22.000+01:00
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -45,6 +45,8 @@ jobs:
         autoreconf --force --install --verbose --warnings=all
         automake --add-missing --copy
         ./configure --prefix=/usr
-        make -j10
+        CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+        JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+        make -j$JOBS
       shell: alpine.sh {0}
 
diff --git a/.github/workflows/arm.yml b/.github/workflows/arm.yml
@@ -58,7 +58,9 @@ jobs:
           g++ --version
           autoreconf -v --install --force
           ./configure --prefix=/usr
-          make -j10
+          CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+          JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+          make -j$JOBS
 
     - name: Get the output
       run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -63,7 +63,10 @@ jobs:
       run: ./configure --prefix=/usr CPPFLAGS="-DDEBUG" CXXFLAGS="-g -O0 -DDEBUG -W -Wall -pedantic"
 
     - name: Build
-      run: make V=1 -j10
+      run: |
+        CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+        JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+        make -j$JOBS
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -53,8 +53,8 @@ jobs:
 
     - name: Generate lcov.info and publish to coveralls.io
       run: |
-        lcov --compat-libtool --directory . --capture --output-file lcov-all.info
-        lcov --remove lcov-all.info '/usr/include/*' './include/*' --output-file lcov.info
+        lcov --compat-libtool --directory . --capture --ignore-errors gcov,gcov --ignore-errors mismatch,mismatch --output-file lcov-all.info
+        lcov --remove lcov-all.info '/usr/include/*' './include/*' --ignore-errors unused,unused --output-file lcov.info
         lcov --list lcov.info
         rm -f lcov-all.info
         coveralls-lcov --branch=${GITHUB_REF##*/} --repo-token "${{ secrets.COVERALLS_REPO_TOKEN }}" lcov.info
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -61,7 +61,9 @@ jobs:
           CPPFLAGS="-DDEBUG" \
           CXXFLAGS="-g -O0 -DDEBUG -DUNIT_TEST" \
           --with-unit-test
-        cov-build --dir cov-int make V=1 -j10
+        CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+        JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+        cov-build --dir cov-int make V=1 -j$JOBS
 
     - name: Submit the result to Coverity Scan
       run: |
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
@@ -42,7 +42,9 @@ jobs:
         autoreconf --force --install --verbose --warnings=all
         automake --add-missing --copy
         ./configure --prefix=/usr
-        make -j10
+        CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+        JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+        make -j$JOBS
       shell: C:\cygwin\bin\bash.exe --login '{0}'
       env:
         WORKSPACE_PATH: "${{ github.workspace }}"
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
@@ -32,5 +32,7 @@ jobs:
           g++ --version
           autoreconf -v --install --force
           ./configure --prefix=/usr
-          make -j10
+          CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+          JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+          make -j$JOBS
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -36,5 +36,7 @@ jobs:
       run: |
         autoreconf -v --install --force
         ./configure --prefix=/usr CPPFLAGS=-I/opt/homebrew/opt/ncurses/include
-        make -j10
+        CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+        JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+        make -j$JOBS
 
diff --git a/.github/workflows/netbsd.yml b/.github/workflows/netbsd.yml
@@ -35,5 +35,7 @@ jobs:
           $CXX --version
           autoreconf -v --install --force
           ./configure --prefix=/usr
-          make -j10
+          CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+          JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+          make -j$JOBS
 
diff --git a/.github/workflows/openbsd.yml b/.github/workflows/openbsd.yml
@@ -34,5 +34,7 @@ jobs:
           eg++ --version
           autoreconf -v --install --force
           ./configure --prefix=/usr
-          make -j10
+          CPU_COUNT="$( ( ( getconf _NPROCESSORS_ONLN 2>/dev/null || (getconf NPROCESSORS_ONLN 2>/dev/null) ) || nprocx 2>/dev/null ) || echo "1")"
+          JOBS="$(( $((CPU_COUNT / 2)) > 1 ? $((CPU_COUNT / 2)) : 1 ))"
+          make -j$JOBS
 
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2025-02-15  Markus Gans  <guru.mail@muenster.de>
+	* Fixed FLineEdit label not shown again after hide() + show()
+
 2025-02-09  Markus Gans  <guru.mail@muenster.de>
 	* Significant speed-up when using FVTerm::copyArea with multiple 
 	  overlapping and transparent layers. This reduces the CPU load 
diff --git a/examples/parallax-scrolling.cpp b/examples/parallax-scrolling.cpp
@@ -482,8 +482,6 @@ void ParallaxScrolling::onTimer (fc::FTimerEvent* ev)
     scrollLeft (layer3_lhs, layer3_rhs);
     picture.setPos (layer3_rhs.getPos());
   }
-
-  forceTerminalUpdate();
 }
 
 //----------------------------------------------------------------------
diff --git a/final/fapplication.cpp b/final/fapplication.cpp
@@ -358,7 +358,7 @@ void FApplication::setLogFile (const FString& filename)
   if ( log_stream.is_open() )
   {
     // Get the global logger object
-    auto& log = FApplication::getLog();
+    const auto& log = FApplication::getLog();
 
     if ( ! log )
       return;
@@ -661,7 +661,7 @@ void FApplication::showParameterUsage()
 }
 
 //----------------------------------------------------------------------
-inline void FApplication::resetLog()
+inline void FApplication::resetLog() const
 {
   // Reset the rdbuf of clog
   std::clog << std::flush;
@@ -1373,7 +1373,7 @@ void FApplication::processLogger() const
 {
   // Synchronizing the stream buffer with the logging output
 
-  auto& logger = getLog();
+  const auto& logger = getLog();
 
   if ( ! logger )
     return;
@@ -1505,7 +1505,7 @@ void setQueued (FEvent& event, bool state)
 //----------------------------------------------------------------------
 auto operator << (std::ostream& outstr, FLog::LogLevel l) -> std::ostream&
 {
-  auto& output = FApplication::getLog();
+  const auto& output = FApplication::getLog();
 
   if ( ! output )
     return outstr;
diff --git a/final/fapplication.h b/final/fapplication.h
@@ -177,7 +177,7 @@ class FApplication : public FWidget
     static void  cmdOptions (const Args&);
     static auto  getStartOptions() -> FStartOptions&;
     static void  showParameterUsage();
-    void         resetLog();
+    void         resetLog() const;
     void         findKeyboardWidget() const;
     auto         isKeyPressed (uInt64 = 0U) const -> bool;
     void         keyPressed();
diff --git a/final/vterm/fvterm.cpp b/final/vterm/fvterm.cpp
@@ -1715,8 +1715,8 @@ inline void FVTerm::inheritBackground (const FChar& src_char, FChar& dst_char) c
 
 //----------------------------------------------------------------------
 inline void FVTerm::putMultiLayerAreaLine ( FChar* dst_char
-                                           , const std::size_t length
-                                           , FPoint& pos ) const noexcept
+                                          , const std::size_t length
+                                          , const FPoint& pos ) const noexcept
 {
   if ( length == 0 )
     return;
diff --git a/final/vterm/fvterm.h b/final/vterm/fvterm.h
@@ -329,7 +329,7 @@ class FVTerm : public FVTermAttribute
     void  putAreaLine (const FChar&, FChar&, const std::size_t) const;
     void  applyColorOverlay (const FChar&, FChar&) const;
     void  inheritBackground (const FChar&, FChar&) const;
-    void  putMultiLayerAreaLine (FChar*, const std::size_t, FPoint&) const noexcept;
+    void  putMultiLayerAreaLine (FChar*, const std::size_t, const FPoint&) const noexcept;
     void  putAreaLineWithTransparency (const FChar*, FChar*, const int, FPoint, bool) const;
     void  addAreaLineWithTransparency (const FChar*, FChar*, const std::size_t) const;
     void  addTransparentAreaLine (const FChar&, FChar&, const std::size_t) const;
diff --git a/final/widget/flabel.cpp b/final/widget/flabel.cpp
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2014-2024 Markus Gans                                      *
+* Copyright 2014-2025 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -175,7 +175,7 @@ void FLabel::onMouseDown (FMouseEvent* ev)
 //----------------------------------------------------------------------
 void FLabel::onAccel (FAccelEvent* ev)
 {
-  if ( ! (isEnabled() && accel_widget) )
+  if ( ! (isEnabled() && isShown() && accel_widget) )
     return;
 
   if ( ! accel_widget->hasFocus() )
diff --git a/final/widget/flineedit.cpp b/final/widget/flineedit.cpp
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2012-2024 Markus Gans                                      *
+* Copyright 2012-2025 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -312,6 +312,15 @@ void FLineEdit::setGeometry ( const FPoint& pos, const FSize& size
     adjustTextOffset();
 }
 
+//----------------------------------------------------------------------
+void FLineEdit::show()
+{
+  FWidget::show();
+
+  if ( label )
+    label->show();
+}
+
 //----------------------------------------------------------------------
 void FLineEdit::hide()
 {
diff --git a/final/widget/flineedit.h b/final/widget/flineedit.h
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2012-2024 Markus Gans                                      *
+* Copyright 2012-2025 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -161,6 +161,7 @@ class FLineEdit : public FWidget
     auto isReadOnly() const noexcept -> bool;
 
     // Methods
+    void show() override;
     void hide() override;
     void clear();
 
diff --git a/final/widget/fwindow.cpp b/final/widget/fwindow.cpp
@@ -516,7 +516,7 @@ void FWindow::swapWindow (const FWidget* obj1, const FWidget* obj2)
 {
   // Swaps the window layer between obj1 and obj2
 
-  auto* vterm_win_list = getWindowList();
+  const auto* vterm_win_list = getWindowList();
 
   if ( ! vterm_win_list
     || vterm_win_list->empty()
